Merge remote-tracking branch 'ui/ui'
authorDavid A. Cuadrado <krawek@gmail.com>
Sun, 17 Jul 2011 05:23:50 +0000 (00:23 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sun, 17 Jul 2011 05:23:50 +0000 (00:23 -0500)
commitc99c9ceac5d43c1871b3f6409b155948d70b0d57
treecb71220fe9fb5f1d0ef033ac2d2818d0476bb9f5
parent9bb42598cc5fdad8e5c3c994954748639802e825
parent4f48a79c008469174083238d589ddd54afa7ef01
Merge remote-tracking branch 'ui/ui'

Conflicts:
app/views/activities/_activity.html.haml
app/views/activities/_activity.html.haml