Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:24:42 +0000 (10:24 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:24:42 +0000 (10:24 +0200)
commit782a38646d29af0f9e66410f62a6428b950fd75a
tree6efb2aa5034cda682193b2193eb6d9c09f220cf0
parente6b27a24c23bb3203df1ee4001fde146eab67298
parentca98430f9042ecd6b01fb38f4074490400f49d3e
Merge branch 'master' into develop