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

[Ville-Pekka Vainio]

commit 996d85fb0aefc98a0d3e26202dcc3b85adc871cd
Merge: 9dc0596 76dd223
Author: Ville-Pekka Vainio <vpvainio at iki.fi>
Date:   Fri Oct 18 21:46:58 2013 +0300

    Merge branch 'master' into f19

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