[bodhi/f14/master: 6/6] Merge branch 'master' into f14

Luke Macken lmacken at fedoraproject.org
Mon Jan 10 19:27:21 UTC 2011


commit 43786335b512e4903f2faad01b43d1445aa72a0e
Merge: efc9da3 e472f57
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Jan 10 14:26:54 2011 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	bodhi.spec
    	sources

 .gitignore |    3 +++
 bodhi.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc bodhi.spec
index b3a6805,bab3866..5b2eced
--- a/bodhi.spec
+++ b/bodhi.spec
@@@ -121,9 -121,9 +121,12 @@@ rm -rf bodhi/tests bodhi/tools/test-bod
  
  
  %changelog
+ * Mon Jan 10 2011 Luke Macken <lmacken at redhat.com> - 0.7.10-1
+ - 0.7.10 release
+ 
 +* Wed Sep 22 2010 Luke Macken <lmacken at redhat.com> - 0.7.9-2
 +- Require python-kitchen
 +
  * Mon Sep 20 2010 Luke Macken <lmacken at redhat.com> - 0.7.9-1
  - 0.7.9 release
  


More information about the scm-commits mailing list