[gdisk/f20: 2/2] Merge branch 'master' into f20

[terjeros]

commit edf70806170419845ae9c851490e977bb119157e
Merge: 8852562 d641aca
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sat Mar 8 21:47:10 2014 +0100

    Merge branch 'master' into f20

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