Merge remote-tracking branch 'branchable/master'

This commit is contained in:
Joey Hess 2011-04-28 17:31:14 -04:00
commit ee0238d229

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 2"
date="2011-04-28T21:22:03Z"
content="""
Ask and ye shalle receive with an Abbot on top: [[special_remotes/hook]]
"""]]