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

[kenhys]

commit 6a5d66ef435816ed046d34035a2bc29851134237
Merge: 8646aa9 c55949f
Author: HAYASHI Kentaro <kenhys at gmail.com>
Date:   Thu Aug 29 23:18:18 2013 +0900

    Merge branch 'master' into f19

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