# HG changeset patch
# User bsw
# Date 1427394787 -3600
# Node ID 7568c15765d9f4a7c2cb1bbc9e8c837022f84d5c
# Parent  5ae3b8d819c5bbaf18edce7250808f2e5a74aee4# Parent  41c84e13584440334861aeeccccea0d405ccff0e
merge

diff -r 5ae3b8d819c5 -r 7568c15765d9 .hgtags
--- a/.hgtags	Thu Mar 26 19:32:44 2015 +0100
+++ b/.hgtags	Thu Mar 26 19:33:07 2015 +0100
@@ -118,3 +118,4 @@
 a3a1a6afcf68343bf3fbf6d5db097bf771e03eee v3.0.4
 749e12242db8cb9985a655f7f3ac93cd6f8152c0 translate
 e2ff0e88180eae75cddcd9ee7ec7138fd244d805 translate
+1d529f76974211dff77ebcd6e06302a7a4396c1e v3.0.5