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

[nonamedotc]

commit 5462d5e8326d81e3d52abbc859801c0282d76e57
Merge: 4a72a4b 4103d04
Author: nonamedotc <nonamedotc at fedoraproject.org>
Date:   Sun Mar 30 13:19:05 2014 -0500

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore

 .gitignore    |   13 +------------
 greybird.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)
---
diff --cc .gitignore
index ad828f7,2349a7b..6a7f43a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,12 -1,10 +1,1 @@@
--/shimmerproject-Greybird-v0.8.2-0-g10555c8.tar.gz
--/shimmerproject-Greybird-v0.9-0-g6ee5f6a.tar.gz
--/Greybird-1.0.7.tar.gz
--/Greybird-1.0.8.tar.gz
--/Greybird-1.2.tar.gz
--/Greybird-1.2.2.tar.gz
--/v1.3.1.tar.gz
--/Greybird-1.3.2.tar.gz
- <<<<<<< HEAD
- =======
--/v1.3.3.tar.gz
- >>>>>>> master
+ /v1.3.4.tar.gz