Merge remote-tracking branch 'origin/master' into cancel_in_upload
[pub/Android/ownCloud.git] / res / anim /
2011-08-19 Bartek Przybylskiinitial commit