Merge remote-tracking branch 'branchable/master'

This commit is contained in:
Joey Hess 2011-02-25 15:55:23 -04:00
commit 92543c969c

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 2"
date="2011-02-25T19:54:28Z"
content="""
But, see [[todo/parallel_possibilities]]
"""]]