]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of /var/www/trunk
authorRobin Millette <millette@plantard.controlezvous.ca>
Thu, 22 Jan 2009 20:49:45 +0000 (20:49 +0000)
committerRobin Millette <millette@plantard.controlezvous.ca>
Thu, 22 Jan 2009 20:49:45 +0000 (20:49 +0000)

Trivial merge