Merge branch 'performance' of https://github.com/tla/stemmatology into performance
authorJess Robinson <j.robinson@shadowcat.co.uk>
Thu, 3 May 2012 08:56:31 +0000 (08:56 +0000)
committerJess Robinson <j.robinson@shadowcat.co.uk>
Thu, 3 May 2012 08:56:31 +0000 (08:56 +0000)
commit65241a526a924d6618da277887f35ef5ed612c6b
tree6947126e07a06a1f556abdde4ef32aa091a66593
parentb12c40e2a6558cd0e9f00341088cc0086e73001e
parentf84a7d06efd4b27e6851e13a05069e7945b72b66
Merge branch 'performance' of https://github.com/tla/stemmatology into performance

Conflicts:
t/data/load-save-benchmark.json
t/data/load-save-benchmark.json
t/load-save-speed.t