Merge branch 'ni-merge'
authorJean Privat <jean@pryen.org>
Thu, 1 Aug 2013 20:54:47 +0000 (16:54 -0400)
committerJean Privat <jean@pryen.org>
Thu, 1 Aug 2013 20:54:47 +0000 (16:54 -0400)
commitdd2007bd7b67975d35fae26349f8adbfa3f6b194
tree38b1eeea8c2d3db2a8a5f1ef9e04269acd0dd5b0
parenta958994caec70c0b5adc810eb62d23105364d40d
parent505d33306af9cae1445d1f886a0aba2d458f9f28
Merge branch 'ni-merge'