Merge remote-tracking branch 'at/nitmetrics'
authorJean Privat <jean@pryen.org>
Fri, 15 Mar 2013 01:01:37 +0000 (21:01 -0400)
committerJean Privat <jean@pryen.org>
Fri, 15 Mar 2013 01:01:37 +0000 (21:01 -0400)
commit9aac91e14f141fdd7dac678a3de3a3116b68b030
treeb54cf8c9151c59e5e32fc82ed93b7dea349d97c7
parentb2386b5f6dc0da608126d87526abe164288c316c
parentecb8e78ad0676bf6ddfec9593e1ab57568601c2c
Merge remote-tracking branch 'at/nitmetrics'

Conflicts:
.gitignore
src/metrics/tables_metrics.nit
tests/Makefile