Merge from fix
authorIain Williamson <iain.williamson@nokia.com>
Thu, 27 May 2010 17:04:53 +0100
changeset 578 cad543700ad8
parent 556 8e705bc1286f (diff)
parent 577 70a350fada5a (current diff)
child 579 e26b09d36de0
Merge from fix
--- a/.hgtags	Thu May 27 12:42:13 2010 +0100
+++ b/.hgtags	Thu May 27 17:04:53 2010 +0100
@@ -14,3 +14,6 @@
 2bc875af320017a5952adb544e78306e7807865c 2.12.0
 007900c31eef0363e705cf15d131740d4eeb6208 2.12.3
 1e23e973ab856a45d9e3e2dcd9a72a9e466c03c7 2.12.2
+679d97112f986e16e9dbed3f7a016388d42e04f8 stable
+e7dd8533063ff0cae181b99ab433f4c08b3ab356 stable
+e7dd8533063ff0cae181b99ab433f4c08b3ab356 2.14.0