Peters Git server - pub/Android/ownCloud.git/commit

author	masensio <masensio@solidgear.es>
	Tue, 22 Oct 2013 08:22:18 +0000 (10:22 +0200)
committer	masensio <masensio@solidgear.es>
	Tue, 22 Oct 2013 08:22:18 +0000 (10:22 +0200)
commit	017f9429c8820ae4c9cc3bf96abe21e97a5f2864
tree	416aaba0f9ecf8f4472118cca0b2c23cd4e4c2e4	tree \| snapshot (tar.gz tar.bz2 zip)
parent	fc5608de767a9c45073b870e2e2860a012800f99	commit \| diff
parent	673c884752392d27023b0d69385d3d884092070c	commit \| diff

Merge branch 'setup_multiaccount' into setup_app_name

Conflicts:
src/com/owncloud/android/ui/activity/AccountSelectActivity.java

ownCloud Android App