]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
authorEvan Prodromou <git@evanprodromou.name>
Thu, 29 Jan 2009 13:37:51 +0000 (08:37 -0500)
committerEvan Prodromou <git@evanprodromou.name>
Thu, 29 Jan 2009 13:37:51 +0000 (08:37 -0500)
commit746880e49eb3955d260835ffbc127c3a02b0f211
tree2162463df70e6c5ff2b754f237af6e9195cdce0a
parentb6fbb9462c5087e00c6812a9e83aa49fae5403a5
parentc7d06519f05e8013fcafd5efc44fa095b4c9e5c3
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk