[derelict/f20: 3/5] Merge remote-tracking branch 'origin/master' into f20

[Hans de Goede]

commit 694674f83cc176fc76ad6dd5fb840268acbe4263
Merge: 283f64f b42176a
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sun Feb 16 11:27:14 2014 +0100

    Merge remote-tracking branch 'origin/master' into f20
    
    Conflicts:
    	.gitignore
    	derelict.spec
    	sources

 .gitignore    |    1 -
 derelict.spec |  134 ++++++++++++++++++++++++---------------------------------
 sources       |    2 +-
 3 files changed, 58 insertions(+), 79 deletions(-)
---