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

[Daniel Vrátil]

commit a83d28cede5fb36f0bc5fc3ce975859aed15234b
Merge: ca339fa 9c9bbca
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Dec 5 16:39:10 2013 +0100

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

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