Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:13:11 +0000 (18:13 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:13:11 +0000 (18:13 +0200)
commit67325ed36cae054c8980f84ed33c3921de293736
treec38538e1d76738889cf5f148bab5eaae6e7500aa
parent66a005416cb7752eb197413e155afe38a0ed5780
parenta957efbd3df9bc957b078f3a12b47ca3258cb699
Merge branch 'master' into develop