]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - locale/el/LC_MESSAGES/statusnet.po
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Thu, 2 Sep 2010 22:04:25 +0000 (15:04 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 2 Sep 2010 22:04:25 +0000 (15:04 -0700)
commit2196d00b1b9a97b498897099c6993383c43b1d44
tree2c0cb5a0d12b93eb743ff93c52c7d3209c619003
parent6df8230488f3c4035ac2c3385631978b5a746fbc
parente365e709c5bab7d593ee1cde26c8bcfdddcc6780
Merge branch '0.9.x' into 1.0.x

Conflicts:
lib/command.php
EVENTS.txt
lib/command.php
lib/util.php