Merge branch 'master', remote-tracking branch 'origin'
[pub/Android/ownCloud.git] / res / xml / preferences_new_session.xml
2011-08-19 Bartek Przybylskiinitial commit