Merge remote-tracking branch 'remotes/upstream/master' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / MainApp.java
2013-10-17 masensioOC-1663: Replace references to app_name in code