Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 24 Jul 2014 07:30:11 +0000 (09:30 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 24 Jul 2014 07:30:11 +0000 (09:30 +0200)
commit9953a942ea1f8f6e02cdd3f600f894228dfc344f
tree2a1650eb1e204e661bbab863d981ddf043321dff
parent3dd7015ebb1f3da81f63dd7f2d4d4e288cf5a4ed
parenta03e7e48eba230a363b8a1ff109355ef2201035a
Merge branch 'master' into develop