# HG changeset patch
# User Flick
# Date 1302649641 25200
# Node ID a7d2efb6ffc9e7dee05b676a72d53182ec1f2ca0
# Parent  920d17851a936226ba80de7b77f3904fa6490166# Parent  7c62b9b7a70f0d8136a2acece738c773990f3273
Merge 1.1 beta 5 to stable

diff -r 7c62b9b7a70f -r a7d2efb6ffc9 .hgtags
--- a/.hgtags	Mon Mar 28 16:25:32 2011 -0700
+++ b/.hgtags	Tue Apr 12 16:07:21 2011 -0700
@@ -1,6 +1,5 @@
 2c05008464e5cf809251d40c8f88ad87fa3ac554 1.1 Beta 1
 9945a783d8b29e6e81eb8d42823d56dc84759d15 1.1 Beta 2
-2c05008464e5cf809251d40c8f88ad87fa3ac554 1.1 Beta 1
-0000000000000000000000000000000000000000 1.1 Beta 1
+3e451836ce6dfa758794c27a4b3a2a1f12595e83 1.1 Beta 3
 47818b3938c912c19018419cb5738d4013107167 1.1 beta 4
 455ef506f9695045737410a6529c9c6eb7d33022 1.1 beta 5