Trying to fix some git madness
Revert "Trying to fix some git madness"

This reverts commit 2650061e1aeb4fc8d09b962a6cd17e89f8d7921f.
Merge branch 'master' of github.com:rgeber/owncloud_core