]> git.donarmstrong.com Git - neurodebian.git/commit
Merge branch 'master' into scale-brochure
authorDon Armstrong <don@donarmstrong.com>
Thu, 19 Feb 2015 20:28:20 +0000 (12:28 -0800)
committerDon Armstrong <don@donarmstrong.com>
Thu, 19 Feb 2015 20:28:20 +0000 (12:28 -0800)
commit7681fdaf675e75c32319a95ad1b19fb581512ebe
tree5925031844090774f0d2b7c2108410b72ef41ea3
parent002623c07e7c5e116d6df5aa96bccdda93e199a9
parent6583765800978d49eeba7c0d93c615c1bab75e80
Merge branch 'master' into scale-brochure

Conflicts:
artwork/brochure/brochure_debian-neurodebian.tex
artwork/brochure/brochure_debian-neurodebian.tex