From: Jean Privat <jean@pryen.org>
Date: Thu, 1 Aug 2013 20:54:47 +0000 (-0400)
Subject: Merge branch 'ni-merge'
X-Git-Tag: v0.6.1~73
X-Git-Url: http://nitlanguage.org

Merge branch 'ni-merge'
---

dd2007bd7b67975d35fae26349f8adbfa3f6b194