Merge branch 'master' into abstract-erd
authorNeil Smith <neil.github@njae.me.uk>
Wed, 18 Jul 2012 08:13:18 +0000 (09:13 +0100)
committerNeil Smith <neil.github@njae.me.uk>
Wed, 18 Jul 2012 08:13:18 +0000 (09:13 +0100)
commitff2fd7989c846568bfdfbc3040b731b20b469d5a
treee05773f3f4a2522173fdced4bea734ee160c86b9
parentd1da176b218b1cc3718ae48b87b6de9edc892c1b
parent678efc2e0c2cb7181ba678ee4c1b941876d779df
Merge branch 'master' into abstract-erd

Conflicts:
Gemfile.lock
spec/spec_helper.rb
Gemfile.lock
spec/spec_helper.rb