[transifex-client/f20: 6/6] Merge branch 'master' into f20

[Nick Bebout]

commit 82c9d023acfd8bf3d9b19314b87342b59d7ae540
Merge: a8fe16d a04b2b8
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sun Mar 23 09:40:05 2014 -0500

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	transifex-client.spec

 .gitignore                               |    1 +
 transifex-client-resource-creation.patch |   37 ++++++++++++++++++++++++++++++
 transifex-client.spec                    |   14 +++++++++--
 3 files changed, 49 insertions(+), 3 deletions(-)
---