Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Fri, 7 Oct 2016 01:56:46 +0000 (22:56 -0300)
committerDavid Bremner <david@tethera.net>
Fri, 7 Oct 2016 01:56:46 +0000 (22:56 -0300)
commitba8fba3d6aa37b1c7698137f6d577309335981ae
tree9d923af5ab7d21a122edafb14abe77d64517245e
parentae06fbfc76edc2ef320a51b6f774079d79078963
parentb2d6f07a028a443c2f96e1684be5ec3addb55d96
Merge branch 'release'