Merge branch 'master' into el5

Conflicts: .gitignore sources wordpress-plugin-bad-behavior.spec
2013-04-03 15:42:30 -05:00 · 2011-03-03 21:33:23 -06:00 · 2010-07-29 15:24:15 +00:00 · 2010-05-29 00:19:21 +00:00 · 2010-03-30 04:56:55 +00:00 · 2009-11-27 05:56:23 +00:00
1 changed files with 0 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -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
Author	SHA1	Message	Date
Nick Bebout	565fb43280	Merge branch 'master' into el5	2013-04-03 15:42:30 -05:00
Nick Bebout	6ecc4a6031	Merge branch 'master' into el5 Conflicts: .gitignore sources wordpress-plugin-bad-behavior.spec	2011-03-03 21:33:23 -06:00
Fedora Release Engineering	d5b777f260	dist-git conversion	2010-07-29 15:24:15 +00:00
Nick Bebout	b2e18323dc	Update to 2.0.36	2010-05-29 00:19:21 +00:00
Nick Bebout	4bdbf77323	Initial commit for EL-5	2010-03-30 04:56:55 +00:00
Kevin Fenzi	c76c0502e7	Initialize branch EL-5 for wordpress-plugin-bad-behavior	2009-11-27 05:56:23 +00:00