Merge remote-tracking branch 'origin/develop' into develop
authormasensio <masensio@solidgear.es>
Tue, 7 Apr 2015 13:12:44 +0000 (15:12 +0200)
committermasensio <masensio@solidgear.es>
Tue, 7 Apr 2015 13:12:44 +0000 (15:12 +0200)

Trivial merge