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

[kenhys]

commit 1399afe878623f96fb110b234520fddc60308574
Merge: af128fa 38540dd
Author: HAYASHI Kentaro <kenhys at gmail.com>
Date:   Fri Jul 26 19:00:25 2013 +0900

    Merge branch 'master' into f19

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