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

[kenhys]

commit b58dc6d41fc956744e04c35fff5139fd0aa9ad91
Merge: 68fa621 171c545
Author: HAYASHI Kentaro <hayashi at clear-code.com>
Date:   Thu Jul 31 03:21:25 2014 -0400

    Merge branch 'master' into f19

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