# HG changeset patch
# User bsw
# Date 1340718921 -7200
# Node ID a8c849f18be6756551dc3c845576ae800a130fde
# Parent  4876b432d44a05a51ebdd68a07da6724f6db2d35# Parent  03083656d8f3c7e957592100619218b8d6578f31
merge

diff -r 4876b432d44a -r a8c849f18be6 .hgtags
--- a/.hgtags	Tue Jun 26 15:55:04 2012 +0200
+++ b/.hgtags	Tue Jun 26 15:55:21 2012 +0200
@@ -62,3 +62,5 @@
 df92aebce0f678c94fd859aafb0ffd2a4a8a5bd0 v2.beta12
 6236e222f0077eb1731c9b69fd65f2083325245f translate
 466c0538cd97b92d93f7f50836ae728548e29f5e translate
+466c0538cd97b92d93f7f50836ae728548e29f5e translate
+8dc2108d7cd2f420bc005cb408c0495b071448a1 translate