From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Mon, 25 Jun 2012 17:46:31 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/android-devel
X-Git-Tag: oc-android-1.4.3~337
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b22ad95e2fe78bc03a43c83dfef6232a187d8fdd?hp=-c

Merge branch 'master' of gitorious.org:owncloud/android-devel
---

b22ad95e2fe78bc03a43c83dfef6232a187d8fdd