]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
authorEvan Prodromou <evan@status.net>
Fri, 28 Aug 2009 20:35:48 +0000 (13:35 -0700)
committerEvan Prodromou <evan@status.net>
Fri, 28 Aug 2009 20:35:48 +0000 (13:35 -0700)
1  2 
lib/util.php

diff --cc lib/util.php
Simple merge