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

[kenhys]

commit 8ad025ca6be71c9c73a768b96ffacc8a2718d7e9
Merge: 6a5d66e ab4932d
Author: HAYASHI Kentaro <kenhys at gmail.com>
Date:   Sun Sep 29 12:13:19 2013 -0400

    Merge branch 'master' into f19

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