Merge branch 'master' into notifications
authorDavid A. Cuadrado <krawek@gmail.com>
Sun, 6 Nov 2011 03:35:41 +0000 (22:35 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Sun, 6 Nov 2011 03:35:41 +0000 (22:35 -0500)
commitf8035f4b4a34c1350f795a36fbce6ca8fcc6a2b3
tree79438ce2ef469e7b5ea2233ad8ddf0e7fb69825b
parent8019a077cc644d1122009e02f380334e9a0924a5
parentcb13f0312bd5a3140490791faf549217e909eeb6
Merge branch 'master' into notifications

Conflicts:
Gemfile.lock
Gemfile.lock