Mike West d4f527f2d6 Merge branch 'block-comment-styles' of https://github.com/hyperbolist/rocco into hyperbolist-block-comment-styles ... Conflicts: lib/rocco.rb		2011-04-20 21:50:57 +02:00
..
rocco	Revert "Fixing a bug in layout.rb's template directory location"	2011-03-17 20:16:12 +01:00
rocco.rb	Merge branch 'block-comment-styles' of https://github.com/hyperbolist/rocco into hyperbolist-block-comment-styles	2011-04-20 21:50:57 +02:00