Merge branch 'master' into pr/177

This commit is contained in:
Paul Tagliamonte 2013-05-17 11:03:45 -04:00
commit 9b1dba0564
2 changed files with 2 additions and 1 deletions

View File

@ -10,3 +10,4 @@
* Konrad Hinsen <konrad.hinsen@fastmail.net>
* Vladimir Gorbunov <vsg@suburban.me>
* John Jacobsen <john@mail.npxdesigns.com>
* rogererens <roger.erens@e-s-c.biz>

View File

@ -71,7 +71,7 @@ the hy interpreter:
(setv result (- (/ (+ 1 3 88) 2) 8))
This would return 37. But why? Well, we could look at the equivalent
This would return 38. But why? Well, we could look at the equivalent
expression in python::
result = ((1 + 3 + 88) / 2) - 8