]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Mon, 31 Jan 2011 19:50:06 +0000 (11:50 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 31 Jan 2011 19:50:06 +0000 (11:50 -0800)
commit47f31bce47b182aa55c02c7872d7e473d3ab10f2
tree6c4760877a0744aa962e1199042455885604b91c
parent54f7154db8146e42dfa557d3d0651fd3255ac380
parenta7abb2323e7d57125b9fbc903a1cecc06c27944e
Merge branch 'master' into testing

Conflicts:
classes/Profile.php
lib/default.php