]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9-release'
authorZach Copley <zach@status.net>
Fri, 20 Nov 2009 04:51:20 +0000 (20:51 -0800)
committerZach Copley <zach@status.net>
Fri, 20 Nov 2009 04:51:20 +0000 (20:51 -0800)
commit003b25ee5690771ab9d8c28a85352abfee62cd0a
treeac0ba59c0c7e96474aec98d18e106985e6f451b1
parente3de04f8cd494ba255ff6167542fda849c2fa61c
parente1fcac0e0908be45c9aa7e840a6fcb2ca600eac5
Merge branch '0.9-release'

* 0.9-release:
  Changed DEFINE name to avoid conflicts