Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Dec 2013 07:52:00 +0000 (08:52 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 11 Dec 2013 07:52:00 +0000 (08:52 +0100)
commit61a12ae15f0d2ad008bb16fba68f8dc22630a389
tree30352579b0f96d24f487a0e950f3cb27c17cf770
parent5274191c1e165a615645a4c10c8ca0220d347a3b
parent619701c9966b1621b4062bb7d02aec45a8427991
Merge remote-tracking branch 'origin/develop' into develop