chiark / gitweb /
Merge branch 'devel' of ssh://code.alephobjects.com/diffusion/CURA/cura into devel
authorSteven Abadie <steven@alephobjects.com>
Fri, 28 Aug 2015 19:22:23 +0000 (13:22 -0600)
committerSteven Abadie <steven@alephobjects.com>
Fri, 28 Aug 2015 19:22:23 +0000 (13:22 -0600)

Trivial merge