Merge branch 'master' into el6

Conflicts: .gitignore sources wordpress-plugin-bad-behavior.spec
2013-02-20 22:07:16 -06:00 · 2011-03-03 21:31:46 -06:00 · 2010-07-29 15:24:16 +00:00 · 2010-05-29 00:19:22 +00:00 · 2010-05-08 02:28:42 +00:00 · 2010-03-09 18:56:39 +00:00
1 changed files with 0 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,2 @@
-bad-behavior.2.0.36.zip
-/bad-behavior.2.0.38.zip
 /bad-behavior.2.0.42.zip
 /bad-behavior.2.2.13.zip
Author	SHA1	Message	Date
Nick Bebout	8922c89fc5	Merge branch 'master' into el6	2013-02-20 22:07:16 -06:00
Nick Bebout	5b777783f1	Merge branch 'master' into el6 Conflicts: .gitignore sources wordpress-plugin-bad-behavior.spec	2011-03-03 21:31:46 -06:00
Fedora Release Engineering	169ad7ad3b	dist-git conversion	2010-07-29 15:24:16 +00:00
Nick Bebout	f08147dcdd	Update to 2.0.36	2010-05-29 00:19:22 +00:00
Dennis Gilmore	3f3ec0f2f8	Initialize branch EL-6 for wordpress-plugin-bad-behavior	2010-05-08 02:28:42 +00:00
Nick Bebout	8548c6d34f	Initial commit	2010-03-09 18:56:39 +00:00