]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Fri, 10 Jun 2011 20:50:33 +0000 (16:50 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 10 Jun 2011 20:50:33 +0000 (16:50 -0400)
1  2 
classes/User.php

Simple merge