Merge remote-tracking branch 'origin/develop' into share_password_support
authormasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:27:35 +0000 (14:27 +0100)
committermasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:27:35 +0000 (14:27 +0100)
commit01483a38bf667e626b66c39604b6c9576afec206
treec19e66741cce7d44e364bcf64b97a71ecb8befce
parent88ff4ff9100c71f794196b7cd1b3a6c3519575a6
parent5f3175229a3baf081ce5677f748d758bcb3676ac
Merge remote-tracking branch 'origin/develop' into share_password_support