]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist
authorEvan Prodromou <evan@status.net>
Tue, 22 Mar 2011 22:17:09 +0000 (18:17 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 22 Mar 2011 22:17:09 +0000 (18:17 -0400)
commitfd8dad39633870d2d71c3829a756e724acb45c2a
treeb845ae50a15c04617ccd2567b221b5d452c986ff
parent31e7d46a5b03c9082d38beed413b4af91a050a63
parent9af92f94bded2ee788785519f957756738e00738
Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist

Conflicts:
classes/Notice.php
classes/Profile.php