[jbrout/el6: 12/12] Merge branch 'master' into el6

[Matej Cepl]

commit cdbe1341fe7eb41e0c030bfdf81448daea867a30
Merge: 9b4ca1a 3aa170d
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Oct 1 16:31:21 2014 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	jbrout-no-pyexiv2-warning.patch
    	jbrout-purge-no-attribute-attrib.patch
    	jbrout.spec

 .gitignore                             |    6 +-
 jbrout-no-pyexiv2-warning.patch        |   28 --
 jbrout-pillow.patch                    |   22 ++
 jbrout-purge-no-attribute-attrib.patch |   23 +-
 jbrout.spec                            |   99 ++++---
 patch                                  |  496 ++++++++++++++++++++++++++++++++
 sources                                |    2 +-
 7 files changed, 583 insertions(+), 93 deletions(-)
---
diff --cc .gitignore
index d8edeeb,60eae5f..3d48c65
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,2 @@@
--jbrout-0.3.282.tar.xz
--jbrout_0.3.284.tar.gz
--jbrout.tar.bz2
- /jbrout
+ /jbrout.tar.bz2
+ /jbrout.tar.xz