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

[kenhys]

commit af39dfbbe59f7c7fe508e3de8e065305b3565494
Merge: 27033f2 70f0196
Author: HAYASHI Kentaro <hayashi at clear-code.com>
Date:   Tue Nov 4 00:44:45 2014 -0500

    Merge branch 'master' into f19

 .gitignore   |    1 +
 groonga.spec |   37 +++++++++++++++++++++++++++++--------
 sources      |    2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
---