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

[kenhys]

commit 68fa621f5082e96942fe430fdebdbd45cf3b8105
Merge: 0927651 c7b089d
Author: HAYASHI Kentaro <hayashi at clear-code.com>
Date:   Tue Jul 1 05:26:15 2014 -0400

    Merge branch 'master' into f19

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