[freemind/f19: 2/3] Merge branch 'master' into f19

[Michael Šimáček]

commit 123c2d21ac33be98873a33e6b33b03e243bd1de8
Merge: 6beb68f b4830d0
Author: Michael Simacek <msimacek at redhat.com>
Date:   Sun Jun 1 12:06:51 2014 +0200

    Merge branch 'master' into f19

 freemind.sh   |   32 --------------------------------
 freemind.spec |   12 +++++++-----
 2 files changed, 7 insertions(+), 37 deletions(-)
---