Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Thu, 28 Jan 2010 03:05:32 +0000 (22:05 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 28 Jan 2010 03:05:32 +0000 (22:05 -0500)
commit5e1a9ad04d4e10ee44881a26ea72c9a80f748188
tree78b7f4287d00a2ff32cf6adf82c6289a5d3b6b95
parent817f01c3b18ec626701de2a1402562eeb87eee6d
parentee4ea3f3e1eb64df2dd3ba677f5201f8787482a8
Merge branch 'testing'

Conflicts:
theme/base/css/display.css
theme/base/css/display.css