Merge remote-tracking branch 'origin/patches_list' into 2.1
authorKlaas Freitag <freitag@owncloud.com>
Wed, 18 Nov 2015 13:33:32 +0000 (14:33 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Wed, 18 Nov 2015 13:33:32 +0000 (14:33 +0100)
commitfb42183bc76809edbfe70cfb2ec2ea1cce0bd27c
tree3f92e2d8fc4ea164d07ddc79b1ea2c4b5e36ec1e
parent65ec8a9e94721a052799b304fcc991bd706b1345
parentb3c2c594bd8c91d49a45c783347b92908c7cf67f
Merge remote-tracking branch 'origin/patches_list' into 2.1