Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 23:43:55 +0000 (19:43 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 18 Sep 2011 23:43:55 +0000 (19:43 -0400)
commit7f2f333528fac83086568fc47b0b6dbcf6892038
treec02843da5c82ec44578ad04fa113474ae15b8f5e
parente2cc7f550a08392ed7e443f7903be02800c28dc4
parent56c63159681bf881c078e79350b753bd850f698d
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
theme/base/css/display.css