Merge branch 'develop' into share_password_support
authorpurigarcia <pgarcia@solidgear.es>
Tue, 10 Mar 2015 09:30:31 +0000 (10:30 +0100)
committerpurigarcia <pgarcia@solidgear.es>
Tue, 10 Mar 2015 09:30:31 +0000 (10:30 +0100)

Trivial merge