Merge remote-tracking branch 'origin/master' into jstime jstime
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Fri, 11 Nov 2011 19:46:13 +0000 (14:46 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Fri, 11 Nov 2011 19:46:13 +0000 (14:46 -0500)
commite4da2dd392f238ca1b65c925b9127a7af2f18f44
tree6f6af3ed75a5eeb60d98686659f567a551a6f456
parent8b06ff607ba97455530887ef0063c0a55ad95c22
parentdc774da18dd47f9e1530d541bf3d31e8ab786d40
Merge remote-tracking branch 'origin/master' into jstime

Conflicts:
app/views/questions/_answer.html.haml
app/views/questions/_answer.html.haml
config/assets.yml