upstream fixes and a lot of taxonomy stuff

2012-07-10 06:28:02 -07:00
parent 1215de575d
commit 94fabe3a29
10 changed files with 32 additions and 16 deletions
--- a/include/lock.php
+++ b/include/lock.php
@@ -73,5 +73,3 @@ function unlock_function($fn_name) {

 	return;
 }}
-
-?>