[wordpress-plugin-bad-behavior/f13/master: 8/8] Merge branch 'master' into f13

[Nick Bebout]

commit 428b3ce4cf03e05cfa062b8090ccb3076086be4e
Merge: 7f6c53f 75a332e
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Mar 3 21:28:51 2011 -0600

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	wordpress-plugin-bad-behavior.spec

 .gitignore                         |    2 +-
 sources                            |    2 +-
 wordpress-plugin-bad-behavior.spec |   64 ++++++++---------------------------
 3 files changed, 17 insertions(+), 51 deletions(-)
---
diff --cc .gitignore
index 1a3c311,7ad0a80..47c06e6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--bad-behavior.2.0.36.zip
 -/bad-behavior.2.0.38.zip
+ /bad-behavior.2.0.42.zip