Merge branch 'develop' into share_password_support
authorpurigarcia <pgarcia@solidgear.es>
Mon, 9 Mar 2015 08:21:38 +0000 (09:21 +0100)
committerpurigarcia <pgarcia@solidgear.es>
Mon, 9 Mar 2015 08:21:38 +0000 (09:21 +0100)

Trivial merge