Merge remote-tracking branch 'origin/fix-bootstrap' into networks
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Wed, 29 Jun 2011 22:45:59 +0000 (17:45 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Wed, 29 Jun 2011 22:45:59 +0000 (17:45 -0500)
commit4cb5a34044468e7105701fc34923fa27cd00d39f
tree9c080150f2a60ea5cd1804ca95f5b2177e28d31d
parentb42b66afa0f8714c609bcbdbd300e976e152de15
parent95a04a8aa8ecad54e273686ab5d9330232fd1d3a
Merge remote-tracking branch 'origin/fix-bootstrap' into networks

Conflicts:
Gemfile.lock
Gemfile