merge fix
authorBartek Przybylski <bart.p.pl@gmail.com>
Wed, 23 May 2012 20:43:15 +0000 (22:43 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Wed, 23 May 2012 20:43:15 +0000 (22:43 +0200)
commit3951aa97f0ff08ad62404822a3bab9986ef8c747
tree05c6b30dd23c47fd64ec6d36326ee4f7df8b0f78
parent49ad249816495a1c20254ac8d91abb581d86114a
parent5ae7704ef1a9e40ca0193c303b9185de28f04b2d
merge fix
src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
src/eu/alefzero/owncloud/datamodel/OCFile.java