[gammaray/f20: 2/2] Merge branch 'master' into f20

[Daniel Vrátil]

commit 4d8bc63521cff06ca7c02cb92743e70525a2703b
Merge: 01e1109 f3d85d5
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Feb 3 15:43:18 2015 +0100

    Merge branch 'master' into f20

 gammaray.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---