Merge branch 'master' into develop
authormasensio <masensio@solidgear.es>
Tue, 7 Jul 2015 11:15:35 +0000 (13:15 +0200)
committermasensio <masensio@solidgear.es>
Tue, 7 Jul 2015 11:15:35 +0000 (13:15 +0200)
commit629cff2d3f8e7641f86f02452851cc0194f7c830
treeac33a9e26644fbd729ea90f20569350f4ecbc542
parentcfe5b84573878f3cf3c5f4f5593840675f84b01b
parent174fa1f36be204e032a7448bade55f4114573f94
Merge branch 'master' into develop