Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:32 +0000 (17:58 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:32 +0000 (17:58 +0100)
commite9ba0ebbfae76d20f74f296259f694844504836f
tree58fa10079c4f1297810ca55d7b2aeea244633ff7
parent5d49850c2593b68523051571925157939041f68d
parente901b609baa4dd5f681e2a5257c9e504997e3377
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan