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

[Daniel Vrátil]

commit a7f1db8ddec7760b6f8ab75803ca084d3c133d7a
Merge: a83d28c ea8d7ff
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Dec 5 16:42:15 2013 +0100

    Merge branch 'master' into f19

 gammaray.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---