From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 19 Jun 2013 15:56:46 +0000 (+0200)
Subject: Merge branch 'develop'after SPRINT-002
X-Git-Tag: oc-android-1.4.3~12^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/63a3522ab7c8940ccc48be09e2247f86cbf60598?hp=63a3522ab7c8940ccc48be09e2247f86cbf60598

Merge branch 'develop'after SPRINT-002

Conflicts:
	.classpath
---