From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Apr 2014 15:39:34 +0000 (-0400)
Subject: Merge remote-tracking branch 'anarcat/dev/decentralised_graphics'
X-Git-Tag: debian/3.20140613~86
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a9eb75d1207f7cd5ada02c530cd576c03e48410e

Merge remote-tracking branch 'anarcat/dev/decentralised_graphics'
---

a9eb75d1207f7cd5ada02c530cd576c03e48410e