# HG changeset patch
# User matthiasm
# Date 1422293522 0
# Node ID 992e31b263779fc85282f2433c57e231fb61ec93
# Parent  493f79392e330f948cfef40b67e90d99db80a95a# Parent  282a28b641eb33b2665e205bd96cdd9a96978e0e
merge

diff -r 282a28b641eb -r 992e31b26377 .hgtags
--- a/.hgtags	Mon Jan 26 17:04:44 2015 +0000
+++ b/.hgtags	Mon Jan 26 17:32:02 2015 +0000
@@ -1,1 +1,3 @@
 b3acb3a6de12023a8f9bb00dc88fda7e5853cdb7 v1.0
+e291f3657872db892f6ee525b36e98472a5ccd26 tony_v0.5
+062f0e49187789937b6162d2904b1af20872ed5e tony_v0.6