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)
commit3be1cb01eb596a735adfcdad1e28fcd7298cbf7d
tree66244ef6a25f8e6d89f577bf2edcbcfa18bdaa5f
parent9ab0c8c16017c9b1c201b4b17a381162130f8705
parent5ba3da3916361576276e6b3d7b0ca1f808798012
Merge remote-tracking branch 'github-stefan/ni' into ni-merge