Merge branch 'stable'
authormasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:45:20 +0000 (10:45 +0200)
committermasensio <masensio@solidgear.es>
Wed, 30 Sep 2015 08:45:20 +0000 (10:45 +0200)
commit5a8f605ed99317b8baaedcadc24602d99db665e2
tree4d2e7be688b41b4025662836ee69c0465d8c0042
parent4316d7082f69fd8f094caa68a3001b7ed9a43316
parentdf1f824e13265b431a8c3ef803d1ec1ce2e21859
Merge branch 'stable'