Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6
authormasensio <masensio@solidgear.es>
Fri, 11 Oct 2013 12:54:13 +0000 (14:54 +0200)
committermasensio <masensio@solidgear.es>
Fri, 11 Oct 2013 12:54:13 +0000 (14:54 +0200)
commit2694ac00c69de87628ba589b2148b326c5526f80
tree85b9443c1c8684c9199ff1e47695bc098e0cfbe1
parentd4a020e3380aa5876cf3680bb2636a75373c4985
parent552a34689c79cf6159807b4e5850117bde5228e8
Merge remote-tracking branch 'origin/release-1.4.6' into release-1.4.6