Merge branch 'next' into next-ui
authorDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Nov 2010 05:55:46 +0000 (00:55 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Fri, 26 Nov 2010 05:55:46 +0000 (00:55 -0500)
commit9a49315509b7b18731114af3ad7a126c18586efb
treeddb6b6c1172e62c684e2f86562ca3841766d205c
parentb0d98fe364d0e5b1c83d4fda256d5d001695b75d
parent50ef99124312ba484062712d6a5e9237657ec222
Merge branch 'next' into next-ui

Conflicts:
.gitignore
app/views/shared/layout/_footer.html.haml
.gitignore