owncloud/core — pull request #9008 by icewind1991 (2014-06-12 13:30:00+00:00)
Title: Repair broken parent link in the scanner - stable6

backport of #8968

cc @PVince81 @ser72 @karlitschek @craigpg