Merge branch 'catalyst-spec-man-page' into catalyst_2
authorSebastian Pipping <sebastian@pipping.org>
Tue, 10 Jul 2012 18:31:47 +0000 (20:31 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Tue, 10 Jul 2012 18:31:47 +0000 (20:31 +0200)

Trivial merge