# HG changeset patch
# User Thomas Klausner <tk@giga.or.at>
# Date 1363278676 -3600
# Node ID 60949d03d17a6f900f9e9102685c9c3c80f9369b
# Parent  ce3cacbbccc97b6b87bd5275c95eed95e95107cd# Parent  2bb001e842fec5c212fe9f19db179d79181f2f99
merge

diff -r ce3cacbbccc9 -r 60949d03d17a .hgtags
--- a/.hgtags	Thu Mar 14 17:31:00 2013 +0100
+++ b/.hgtags	Thu Mar 14 17:31:16 2013 +0100
@@ -31,3 +31,6 @@
 ae96ae28f3ddc48b9e2676e9538008eab2b9d60a 1.1.5
 8500947421cb412b5f4f2dfffdf1a35b6fb369e0 FORK
 155d45d0653025f45b58ab96b6ba0d5e6fb7fcf8 1.1.6
+8500947421cb412b5f4f2dfffdf1a35b6fb369e0 FORK
+0000000000000000000000000000000000000000 FORK
+ec348f6043998ca77d2b3122ef47157c82055ccd proposed_merged