From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 13 May 2012 14:19:22 +0000 (+0200)
Subject: merge fix
X-Git-Tag: oc-android-1.4.3~426
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/390949b8323633b26d56b3a837e83941cbc24b4b?hp=390949b8323633b26d56b3a837e83941cbc24b4b

merge fix
---