[greybird/f20: 5/5] Merge remote-tracking branch 'origin/master' into f20

[Kevin Fenzi]

commit b0e9badeff97503c5e79d52dc9071c7955fd8ea7
Merge: 5462d5e 53c07fa
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Nov 18 12:13:53 2014 -0700

    Merge remote-tracking branch 'origin/master' into f20

 .gitignore                                 |    1 +
 fix-checkboxes-and-radios-in-gtk3.14.patch |  212 ++++++++++++++++++++++++++++
 greybird.spec                              |   30 ++++-
 sources                                    |    2 +-
 4 files changed, 242 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 6a7f43a,316fadf..4735bcc
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,11 +1,2 @@@
 -/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
 -/v1.3.3.tar.gz
  /v1.3.4.tar.gz
+ /v1.4.tar.gz