Merge branch 'develop' into fix_send
authorpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:46:48 +0000 (08:46 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 10 Jul 2015 06:46:48 +0000 (08:46 +0200)

Trivial merge