Merge branch 'develop' into release-1.4.6
authormasensio <masensio@solidgear.es>
Mon, 7 Oct 2013 12:36:43 +0000 (14:36 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Oct 2013 12:36:43 +0000 (14:36 +0200)
commitd4a020e3380aa5876cf3680bb2636a75373c4985
tree98efd4456ba0e4401eaa1143740c746ca6e69b1c
parent86f7f0cc3c316fc9f1caeedc5ba63ccfb7a0ffd7
parenta67a6766a6ca69bb97d2fdc87256ec9f0fa5122d
Merge branch 'develop' into release-1.4.6