# HG changeset patch # User Felix Wolfsteller # Date 1349337516 -7200 # Node ID cc9b6f23eaf846e7d24546cba9a011c5c6d25078 # Parent e249bd8fe72e40001a71c43993bb612b1d5da637# Parent d8f8eaf85154d45535f3371f1d1848a9bd10d415 Merged. diff -r e249bd8fe72e -r cc9b6f23eaf8 .hgtags --- a/.hgtags Tue Oct 02 12:18:03 2012 +0200 +++ b/.hgtags Thu Oct 04 09:58:36 2012 +0200 @@ -14,3 +14,4 @@ 6aeee2250418e85806b6eabafc48bfe625b892eb pre2.6-2011-12-05 ecab7e7804a9166f582e7904a2bb0c8c14eaf94e pre2.6-2012-01-04 8a75cf0841b1e4a361cb547dd02616e7c1015a5b pre2.7-2012-03-16 +e1691b74f3aa888fe7b2cf78a4be3678abe6da45 flys-2.9.2