Merge remote-tracking branch 'origin/master' into fixes-kuadrosx
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Wed, 14 Sep 2011 17:10:59 +0000 (12:10 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Wed, 14 Sep 2011 17:10:59 +0000 (12:10 -0500)
commit2ea7590fa03bdd206e45cb02eca5d95855f85d7c
treeac6f2abf1d399972704ae994260be5869c7bcab6
parent9e65f04eeac219cb6ea91c10d3ac8e13b0c4a359
parentc9fd659c0e54901a12fade5d2f24cc82f9ac68b5
Merge remote-tracking branch 'origin/master' into fixes-kuadrosx

Conflicts:
app/views/wiki/_version.html.haml