Merge branch '1844-mentions-in-markdown' of github.com:brianwisti/diaspora into 1844-mentions-in-markdown

This commit is contained in:
Brian Wisti 2011-08-30 14:56:56 -07:00
commit d2f1f2fba9

Diff content is not available