]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote-tracking branch 'anarcat/dev/decentralised_graphics'
authorJoey Hess <joey@kitenet.net>
Fri, 18 Apr 2014 15:39:34 +0000 (11:39 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 18 Apr 2014 15:39:34 +0000 (11:39 -0400)

Trivial merge