Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 10 Jul 2013 07:06:08 +0000 (09:06 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 10 Jul 2013 07:06:08 +0000 (09:06 +0200)
commit133e89d49559be9ead2449c2bdc7cd38ec23a71b
treee9b24f52a97cedb93a6186df90eef8abf7c146ed
parent7680159cd797066711c01ae46c02300378e47075
parent81ef2eaaeae9ac1d4bae4257f22ce83c0170aab8
Merge branch 'master' into develop