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

[Daniel Vrátil]

commit 235c9ed858f2c6de838d1562cecc2f4e0c85fc95
Merge: a7f1db8 56496b2
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Jan 22 18:46:54 2014 +0100

    Merge branch 'master' into f19

 .gitignore    |    1 +
 gammaray.spec |   43 ++++++++++++++++++++++++++++++++-----------
 sources       |    2 +-
 3 files changed, 34 insertions(+), 12 deletions(-)
---