Merge branch 'master' of gitorious.org:maximus/book
authorClaude Heiland-Allen <claude@mathr.co.uk>
Thu, 13 Mar 2014 12:13:32 +0000 (12:13 +0000)
committerClaude Heiland-Allen <claude@mathr.co.uk>
Thu, 13 Mar 2014 12:13:32 +0000 (12:13 +0000)
commit92f0bfdb7a16471dafb341a223fdaabf89fa6b1e
tree18ad2b8db502d8be0d87a51d93f613e175226f26
parent643106f7ca1a9fcb260984b8ae53acd0fac07454
parent8ce7cb68367621de73c2b0e421ffdb1ed09e0051
Merge branch 'master' of gitorious.org:maximus/book