Merge branch 'stable' into fc/master
authorFelipe Contreras <felipe.contreras@gmail.com>
Fri, 19 Apr 2013 00:24:18 +0000 (19:24 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Fri, 19 Apr 2013 00:24:18 +0000 (19:24 -0500)
commit53fce9b3792d01a831af6f201b8dcce00f8fd156
treea4917a7864c5d50c0cb8da0f0421f23a8ce6b7aa
parent9662e16f4c550cadc3db70174eead197ffc677bf
parent5bda18c186e455f8e65f976d3bf333ab1f4b5b53
Merge branch 'stable' into fc/master

Conflicts:
contrib/remote-helpers/test-hg.sh