# HG changeset patch
# User jbe
# Date 1315691573 -7200
# Node ID e8c6035b03f38aa299e6e9b7d2e7d77d1bdcbfe0
# Parent  5d89f5fcdcfcbfdf824aa1809eb8e7a88d314086# Parent  83fc680b33b528ec54883b5dceb246504705fcfd
merge

diff -r 5d89f5fcdcfc -r e8c6035b03f3 .hgtags
--- a/.hgtags	Sat Sep 10 22:42:51 2011 +0200
+++ b/.hgtags	Sat Sep 10 23:52:53 2011 +0200
@@ -45,3 +45,4 @@
 07cfc7c1ce3f9c7191a028d3fabf27881edcc8c7 v1.4.0_rc2
 0fa3c4739ca75a0dd55c073903e274ec20fce137 v1.4.0_rc3
 1be788313b84e0b27f396f34be3838ccb66287a4 v1.4.0_rc4
+d53e276f32ba9a189fc3cc43e3f383f5d6d06dcd v1.4.0
diff -r 5d89f5fcdcfc -r e8c6035b03f3 core.sql