Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Dec 2013 07:52:25 +0000 (08:52 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Dec 2013 07:52:25 +0000 (08:52 +0100)
commit9fe8cadedd33029ac5da1bf4460f20fefa4fc8b0
tree129930ae702f9f26ccc2392e28fb265a29306fce
parentdab156e287876865c694cfc1297ad394fb6dd74d
parentc3d88a0594e32043b2599a37789b7ada4a9ac85a
Merge remote-tracking branch 'origin/release-1.5.2' into release-1.5.2