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

[Orion Poplawski]

commit 91ea9114c48671316fa2227e84b13eb4d812174e
Merge: ab15f0f a6bf449
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Mar 2 11:17:27 2014 -0700

    Merge branch 'master' into el6

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