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

[kenhys]

commit bb07cc5d34820eb0ad2026a4250c77c964abce0d
Merge: c01bac7 4ec5bbe
Author: HAYASHI Kentaro <kenhys at gmail.com>
Date:   Wed Dec 4 05:04:13 2013 -0500

    Merge branch 'master' into f19

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