Merge branch 'calculator' of https://github.com/BlackMinou/nit
authorJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 19:31:18 +0000 (14:31 -0500)
committerJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 19:31:18 +0000 (14:31 -0500)

Trivial merge