Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Nov 2013 07:53:48 +0000 (08:53 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Nov 2013 07:53:48 +0000 (08:53 +0100)
commit6ef1a604ec4b15522ae390d1a54cc658883ed764
treeffb701e4dcee6ed2fbfe2372f521bdb9a179379b
parent9431807ec7fee48d393b7b0f71acafb9c37aa336
parenta8d55d09dd298bd25ddba3d222fe769f71009a70
Merge branch 'master' into develop