merge fix
authorBartek Przybylski <bart.p.pl@gmail.com>
Sun, 13 May 2012 14:19:22 +0000 (16:19 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Sun, 13 May 2012 14:19:22 +0000 (16:19 +0200)
commit390949b8323633b26d56b3a837e83941cbc24b4b
treee6a8a7bd288702c4497567754d7d6e6bf417662d
parent0aeb425885ceccb28b31c9822d52b90656bf9257
parentabf48afde301e30ff341fc154c9b678315783a9e
merge fix
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java