# HG changeset patch
# User Chris Cannam
# Date 1484065292 0
# Node ID f73a4e8c7040866a25c03d4aebad1dd9aa694155
# Parent  a0a37ed3c07af9df181516fafd76bde004ab0e3c# Parent  f016667b4adb9e0c3889b0e3e290e6eb9b8b9402
Merge from branch 3.0-integration

diff -r f016667b4adb -r f73a4e8c7040 .hgtags
--- a/.hgtags	Tue Jan 10 16:04:03 2017 +0000
+++ b/.hgtags	Tue Jan 10 16:21:32 2017 +0000
@@ -50,3 +50,4 @@
 2868d5abf1a3baa37099c1b5d7e984bf8bb8177a sv_v2.4.1
 94253fa113183075c8400fa64d0ccb0e81682f90 sv_v2.5
 e206741df37ddfa3db28bfbbe4b79f2248b92695 sv_v2.5_osx_deploy
+e6c7585863feeba4d278c770314e3455e0020bdb last_v2.5_on_default_branch