Merge branch 'master' of github.com:owncloud/android
authormasensio <masensio@solidgear.es>
Mon, 24 Aug 2015 10:42:25 +0000 (12:42 +0200)
committermasensio <masensio@solidgear.es>
Mon, 24 Aug 2015 10:42:25 +0000 (12:42 +0200)
commit9849205124c3c6f7cc44afcf5ba777a0895435bf
treef8d906256d438c916d406b2a2ada8bb582e2c7c0
parent573b9d172720c9952618080d8b9fbe16725a4a91
parentbf0942c6c328079e1dd5a670b0078fcd734019c1
Merge branch 'master' of github.com:owncloud/android