# HG changeset patch
# User Nicholas Hastings <skamonkey@gmail.com>
# Date 1319815448 14400
# Node ID 55c649e82eb03b4efadf4a0eb53fe03ec8478b01
# Parent  ae5361d0604d32eb370a289826b0bd6cc1d9e476# Parent  46df8cd80c7ef573d583ba2ecc30a1712b6d5320
Merge.

diff -r ae5361d0604d -r 55c649e82eb0 product.version
--- a/product.version	Fri Oct 28 11:23:02 2011 -0400
+++ b/product.version	Fri Oct 28 11:24:08 2011 -0400
@@ -1,1 +1,1 @@
-1.4.0-dev
+1.5.0-dev
diff -r ae5361d0604d -r 55c649e82eb0 pushbuild.txt
--- a/pushbuild.txt	Fri Oct 28 11:23:02 2011 -0400
+++ b/pushbuild.txt	Fri Oct 28 11:24:08 2011 -0400
@@ -51,3 +51,6 @@
 that thing
 clobber build because amx.h changed (sigh)
 a dead fish
+ten clams, ten of them
+snail
+rum ham