[baloo/f20: 12/12] Merge branch 'f21' into f20

[Rex Dieter]

commit 77b6061df3a2c6e4077498af3184c3ef06d81829
Merge: fb8bddf 125e8d3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 13:16:14 2014 -0500

    Merge branch 'f21' into f20

 .gitignore |    3 ++
 baloo.spec |   81 ++++++++++++++++++++++++++++++++++++++++++-----------------
 sources    |    2 +-
 3 files changed, 61 insertions(+), 25 deletions(-)
---