[groonga/f19: 7/7] Merge branch 'master' into f19

[kenhys]

commit 257606774db6d42bc333d3de550802089a100720
Merge: b58dc6d b391e1b
Author: HAYASHI Kentaro <hayashi at clear-code.com>
Date:   Mon Sep 8 13:40:10 2014 -0400

    Merge branch 'master' into f19

 .gitignore                                        |    1 +
 add-missing-mkdir-for-groonga-httpd-service.patch |   12 +++++
 groonga.spec                                      |   47 ++++++++++++++------
 sources                                           |    2 +-
 4 files changed, 47 insertions(+), 15 deletions(-)
---