[python-djblets/f18: 4/4] Merge branch 'master' into f18

[Stephen Gallagher]

commit 2437faa814246bb190589521dfb1f0ef762b97fd
Merge: 5f77adb 37398af
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Mon Jun 3 09:27:40 2013 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	python-djblets.spec
    	sources

 .gitignore          |    1 +
 python-djblets.spec |   36 +++++++++++++++++++++++++++++++++++-
 sources             |    2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
---