Merge branch 'configuration-storage'
commit9fb9bad0427c7a87c833597dde6e07539a3fb43c
authorDominic Clifton <me@dominicclifton.name>
Sun, 3 Apr 2016 20:55:24 +0000 (3 22:55 +0200)
committerDominic Clifton <me@dominicclifton.name>
Sun, 3 Apr 2016 20:55:24 +0000 (3 22:55 +0200)
treeb3684d46b80bf4e29f100f7b28ae66dac200bc6d
parent085e5e6c60a942e6f1b2dfbfc3a34e95a426e07f
parent6c82186376a2b5fff131ae2507eeec39d14edfcc
Merge branch 'configuration-storage'