Merge remote-tracking branch 'dweismueller/owncloud-7' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jul 2014 11:15:33 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jul 2014 11:15:33 +0000 (13:15 +0200)
commit612ce881824ebb63c3cd1ecbc3b381ef70fb0fbf
tree89fef9c98e0c2181fcffb69460b2ca98f004bfda
parentf0728c790ffce0acc5373bc340596a5e9974c8c1
parent3bd9129df0057c35c41cb9d49f9b1e1b71e0ed9c
Merge remote-tracking branch 'dweismueller/owncloud-7' into next