]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
fix conflict with Robin's changes on trunk
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 3 Dec 2008 04:17:30 +0000 (23:17 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 3 Dec 2008 04:17:30 +0000 (23:17 -0500)
commitf41e5317379ca86a28f48f1a1705fb916da36d44
tree5a0bf590a4ec455b401615eff8287d410cda17c5
parent4b586436c8f9baf59b9bdffcdb259f50879f8c7d
fix conflict with Robin's changes on trunk

darcs-hash:20081203041730-5ed1f-1e1910cec75546291b14386d91f3bd22ae06b750.gz
lib/util.php