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

[Daniel Vrátil]

commit e4b3dc11e8ae2cf3f1683ef9ab4771fc6de7b508
Merge: 25415d5 ea8d7ff
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Dec 5 16:42:21 2013 +0100

    Merge branch 'master' into f18

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