[valyriatear/f21: 2/2] Merge branch 'master' into f21

[Erik Schilling]

commit 96be5cb66f34d5561cdf56bf6c63bda390fd2532
Merge: 70aa161 b2a5d1a
Author: Erik Schilling <ablu.erikschilling at googlemail.com>
Date:   Sat Sep 6 11:13:08 2014 +0200

    Merge branch 'master' into f21

 valyriatear.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---