Merge remote-tracking branch 'origin/master' into networks
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 30 Jun 2011 05:42:37 +0000 (00:42 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Thu, 30 Jun 2011 05:42:37 +0000 (00:42 -0500)
commit8919b3944a29d2bb94bd1c770133edf3a8c55ccf
treef177a760276c624bb0fe5a1eeec45cb70b6fb91d
parente7572c01141e6579e8493fcbc95901f31601271b
parent8dc160a5450cadea7f76174b004027ed493c1ea8
Merge remote-tracking branch 'origin/master' into networks
app/controllers/application_controller.rb