]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nofollowexternallink' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 27 Oct 2010 17:53:39 +0000 (13:53 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 27 Oct 2010 17:53:39 +0000 (13:53 -0400)
Conflicts:
lib/default.php


Trivial merge