[wordpress-plugin-bad-behavior/el5: 5/5] Merge branch 'master' into el5

[Nick Bebout]

commit 565fb432802f0b3f0b60aea9e64fc6ff0d915a00
Merge: 6ecc4a6 9bbb805
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Apr 3 15:42:30 2013 -0500

    Merge branch 'master' into el5

 .gitignore                         |    1 +
 sources                            |    2 +-
 wordpress-plugin-bad-behavior.spec |   20 ++++++++++++++++----
 3 files changed, 18 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 000f298,4ccde16..8bab3a8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,3 @@@
 -bad-behavior.2.0.36.zip
  /bad-behavior.2.0.38.zip
  /bad-behavior.2.0.42.zip
+ /bad-behavior.2.2.13.zip