# HG changeset patch
# User Ivan Damnjanovic lnx <ivan.damnjanovic@eecs.qmul.ac.uk>
# Date 1311692477 -3600
# Node ID fec205ec6ef699ecd2acfa2ef3ab92cb73ed13cc
# Parent  d225198235e839be6b21a91079affc86eea637a7# Parent  096c9cd965c67d9f36c4d5390de295d85fc2bbb2
Merge

diff -r d225198235e8 -r fec205ec6ef6 .hgtags
--- a/.hgtags	Tue Jul 26 15:57:57 2011 +0100
+++ b/.hgtags	Tue Jul 26 16:01:17 2011 +0100
@@ -2,3 +2,4 @@
 7750624e0c73c856ab7cfbae6160711e965135b7 version0.5
 9ff69e8e049f936804d0e5876cd4d367be9f3c4a backup 14032011
 b14e1f6ee4bea90a8a894a52c1114a72aa818071 ver_1.1
+19e0af5709140e163faaf9d8cf4b83a664be1edc release_1.5