]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of root@laconi.ca:/var/local/pootle-mirror into pootle/master
authorEvan Prodromou <git@evanprodromou.name>
Fri, 30 Jan 2009 18:21:26 +0000 (13:21 -0500)
committerEvan Prodromou <git@evanprodromou.name>
Fri, 30 Jan 2009 18:21:26 +0000 (13:21 -0500)

Trivial merge