Merge branch 'master' of gitorious.org:maximus/soft-rock-revisited
authorClaude Heiland-Allen <claude@mathr.co.uk>
Thu, 22 Nov 2012 14:07:52 +0000 (14:07 +0000)
committerClaude Heiland-Allen <claude@mathr.co.uk>
Thu, 22 Nov 2012 14:07:52 +0000 (14:07 +0000)
commitb158f6afd7d893860f7962e0eb11d137ce077f83
treeaf4fe1b02f4fbc700f245ccccc3fb2c803d4cd82
parent4b598b6b85a3e1710c2edc3ccfc9cda7a9ee71d4
parent4240b4068f87ae8360ca63aa03d0bc9ae7bd8502
Merge branch 'master' of gitorious.org:maximus/soft-rock-revisited