commit 3e634d8b034e58c10b2df23364936e56c2ca6112 Merge: f47b118 09dbeb2 Author: Stephen Gallagher <sgallagh at redhat.com> Date: Thu Aug 15 21:09:22 2013 -0400 Merge branch 'master' into f18 .gitignore | 1 + python-djblets.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---