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

[Daniel Vrátil]

commit 25415d5ef0a3336f52c25608f88e6cb71049bb3b
Merge: d181189 9c9bbca
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Dec 5 16:39:36 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	sources

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