From: Jean Privat <jean@pryen.org>
Date: Thu, 1 Aug 2013 17:36:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'alexandre/ni-merge' into HEAD
X-Git-Tag: v0.6.1~73^2~5
X-Git-Url: http://nitlanguage.org

Merge remote-tracking branch 'alexandre/ni-merge' into HEAD

Conflicts:
	src/nitmetrics.nit
---

812756daecde3d8a85fff40e713be46f4abcfb3b
diff --cc src/metrics/metrics_base.nit
index ed2ab9a,627af78..cce151d
--- a/src/metrics/metrics_base.nit
+++ b/src/metrics/metrics_base.nit
@@@ -17,9 -17,8 +17,9 @@@
  # Helpers for various statistics tools.
  module metrics_base
  
- import modelbuilder
+ import model_utils
  import csv
 +import counter
  
  redef class ToolContext