# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1456818820 -3600
# Node ID 768bf62890f893570c1e5579eb4d44c1f8951470
# Parent  3c78b86624bc3433be2cae189b68fc5ed358d56c# Parent  424cd77803720d4d91b4f624324cb522a9adaa1d
Merge from stable-2

diff -r 3c78b86624bc -r 768bf62890f8 .hgsigs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgsigs	Tue Mar 01 08:53:40 2016 +0100
@@ -0,0 +1,1 @@
+223487a685b101f5bcbd3e6a7f457d551953bf99 0 iQEcBAABCAAGBQJW1UpnAAoJEKHa+bhAI/MfKRQH/jdmDihcOvqa+4njFcdeUEeonW7YZbRyJenz3fuitMSBu0QdfIHcaSMZlHE7lFTpaj7kEjjssrpPcbjSxkIemi2FHoCkXmHBGYVMQxhHLko5m339FzvXXrK24W6e1IUygTE0iSKEAUjg0Li8U1OY2WPvvOHyNaissbd9AMCBDL38cuudq+jsC9YO/b1UXekuw25f9sLmNpvf4IkmyVbZ0VYnMe4/FmLDfz5OWpjqaFJeVqX46Zd71zbe2ISuHOec+o1RUPAOwyGpZeoOfjoZ20K/OrsZCbpcEZX86u/mW25cKcryJzB66WHJUKz9/UpqwB9kt1nGUClM9xISWz3UPOo=
diff -r 3c78b86624bc -r 768bf62890f8 .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Tue Mar 01 08:53:40 2016 +0100
@@ -0,0 +1,1 @@
+92b0be5ce4b0cc77254585563069719e01c575d5 2.0.0