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

[Hans de Goede]

commit de1a16c25ba24f2a3bab701b1720dfc950fa97da
Merge: 6a3ef3c c078075
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Feb 17 11:41:17 2014 +0100

    Merge remote-tracking branch 'origin/master' into f20

 derelict.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---