Merge branch 'master' into f13

Conflicts: .gitignore sources wordpress-plugin-bad-behavior.spec
dist-git conversion
2011-03-03 21:28:51 -06:00 · 2010-07-29 15:24:13 +00:00 · 2010-05-29 00:19:23 +00:00 · 2010-02-17 03:27:40 +00:00
1 changed files with 0 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1 @@
-bad-behavior.2.0.36.zip
-/bad-behavior.2.0.38.zip
 /bad-behavior.2.0.42.zip
Author	SHA1	Message	Date
Nick Bebout	428b3ce4cf	Merge branch 'master' into f13 Conflicts: .gitignore sources wordpress-plugin-bad-behavior.spec	2011-03-03 21:28:51 -06:00
Fedora Release Engineering	7f6c53fc3a	dist-git conversion	2010-07-29 15:24:13 +00:00
Nick Bebout	900494850d	Update to 2.0.36	2010-05-29 00:19:23 +00:00
Jesse Keating	17724f3ed0	Initialize branch F-13 for wordpress-plugin-bad-behavior	2010-02-17 03:27:40 +00:00