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

[terjeros]

commit 4b028b212bdd2a042ff2dc8300b81e16c2b050c7
Merge: edf7080 eb2fe3d
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sat Mar 21 13:20:05 2015 +0100

    Merge branch 'master' into f20

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