Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:24:29 +0000 (10:24 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:24:29 +0000 (10:24 +0200)
commite6b27a24c23bb3203df1ee4001fde146eab67298
treef6bfe908ee20d09e407c8b5f0cba2f51b310bbfd
parent1f02143d9997dcfa66f8b3f93378c3e1877cb498
parent710e9763660adfe8c655d8304da085bc453b3630
Merge remote-tracking branch 'origin/develop' into develop