Merge remote-tracking branch 'origin/develop'
authormasensio <masensio@solidgear.es>
Thu, 15 Oct 2015 14:17:32 +0000 (16:17 +0200)
committermasensio <masensio@solidgear.es>
Thu, 15 Oct 2015 14:17:32 +0000 (16:17 +0200)
commit8e87cc2bf49407435ca55410577552e4ba6a92d0
treea2477b2d3d07ee946f9915ee55742da3584563a5
parentc47b0ab77ac00c001eb649141c0c3a24587164ba
parentfc40765890415abe9f2569a44adcbe88412ea1ba
Merge remote-tracking branch 'origin/develop'