Merge.

2011-10-28 11:24:08 -04:00
parent 4d07acd384 2c06bb46ea
commit e7f5f4a6af
2 changed files with 4 additions and 1 deletions
@@ -1 +1 @@
-1.4.0-dev
+1.5.0-dev
@@ -51,3 +51,6 @@ clobstermonkey
 that thing
 clobber build because amx.h changed (sigh)
 a dead fish
+ten clams, ten of them
+snail
+rum ham