Merge branch 'master' of gitorious.org:maximus/soft-rock-revisited
authorClaude Heiland-Allen <claude@mathr.co.uk>
Wed, 21 Nov 2012 22:31:16 +0000 (22:31 +0000)
committerClaude Heiland-Allen <claude@mathr.co.uk>
Wed, 21 Nov 2012 22:31:16 +0000 (22:31 +0000)
commit4b598b6b85a3e1710c2edc3ccfc9cda7a9ee71d4
treedd9d79cf9144d07b5ee98a1deb5b221e55340671
parent74faa11093ceec0440525702fc881ed4d1bf2b5c
parentd6e7569d399aa54a02f7139506d1e7d0be7afb68
Merge branch 'master' of gitorious.org:maximus/soft-rock-revisited