Merge branch '2.0.2' into 2.0
authorKlaas Freitag <freitag@owncloud.com>
Thu, 29 Oct 2015 14:44:56 +0000 (15:44 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Thu, 29 Oct 2015 14:44:56 +0000 (15:44 +0100)
commitee653155208081a3d5faf9b688dfbbbcc93fdf40
tree82ef5cd3259b5af06d459e9cab234d90d22bc235
parent4d7fde59c247c2d8c62ff7c760b6f5bb30bb6b95
parent726be08917cfdcd29158f3ad38ff93e629e610b7
Merge branch '2.0.2' into 2.0

Conflicts:
ChangeLog