From: Christoffer Bubach <christoffer@ridestore.com>
Date: Tue, 6 Jan 2015 21:01:58 +0000 (+0100)
Subject: Merge commit 'dba047e616f303ce818ba9ac7fb9f8a18a3717d3'
X-Git-Url: https://git.wirehaze.ovh/BOS.git/commitdiff_plain/ca7bddd67adf9e8da536d21dab2a0a1d42d08a65

Merge commit 'dba047e616f303ce818ba9ac7fb9f8a18a3717d3'
---

ca7bddd67adf9e8da536d21dab2a0a1d42d08a65