Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:54:47 +0000 (17:54 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:54:47 +0000 (17:54 +0100)
commit5d49850c2593b68523051571925157939041f68d
tree76b4b8941336812d31a7ea14ccbbd7f10952d677
parent4bbb4846bb97a4be0ff0dbc8ee43295729def71a
parentbb8a10f735ac9ef9c1173b279e5aee68a0f8fd73
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan