]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - classes/User_im_prefs.php
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 3 May 2010 23:27:35 +0000 (16:27 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 3 May 2010 23:27:35 +0000 (16:27 -0700)
commit34644441a90ef6369733b08644aa6a25492a4d61
tree4a6e59dc3bcfeb810212b2d5f00a708172be8e1e
parent5414396a2ee9f1401d69b60969e04a1941e24e21
parentf514f7b722f71fa8b60d0ee88e54d47d4a05af4a
Merge branch '0.9.x' into 1.0.x