Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Tue, 18 Aug 2015 08:16:13 +0000 (10:16 +0200)
committermasensio <masensio@solidgear.es>
Tue, 18 Aug 2015 08:16:13 +0000 (10:16 +0200)
commit95db3421f64f2f1dd335757155b1592f474ccb9a
tree32a6a6bad67bf773d99feca1f730b95a264f9e66
parent80c112ad1a40308e16b5f8ae712e9f7d934dc571
parentba4b2586974ba69549dd395435924da233c6d1e6
Merge branch 'master' into develop