[gammaray/f19: 4/4] Merge branch 'master' into f19

[Daniel Vrátil]

commit 3f0ebf73339f66558faa36b40119f45e8c6fb263
Merge: 235c9ed 0aae79b
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Jan 23 15:56:48 2014 +0100

    Merge branch 'master' into f19

 gammaray-libexec-install-dir-fix.patch |   19 +++++++++++++++++++
 gammaray.spec                          |   21 ++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)
---