Merge remote-tracking branch 'github-stefan/ni' into ni-merge
authorAlexandre Terrasa <alexandre@moz-code.org>
Mon, 8 Jul 2013 15:17:26 +0000 (11:17 -0400)
committerAlexandre Terrasa <alexandre@moz-code.org>
Mon, 8 Jul 2013 15:17:26 +0000 (11:17 -0400)

Trivial merge