From: Lennart Rosam <lennart@familie-rosam.de>
Date: Sun, 15 Apr 2012 10:41:36 +0000 (+0200)
Subject: Merge branch 'fragments-ui' of
X-Git-Tag: oc-android-1.4.3~443
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/51302a638677b16c5faac6242da44080794f537e?hp=51302a638677b16c5faac6242da44080794f537e

Merge branch 'fragments-ui' of
ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
	src/eu/alefzero/owncloud/datamodel/OCFile.java
---