merge from trunk
commitfffcc46aabbe28b6f2ef8427f858abe58d3b615e
authorJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 18:42:15 +0000 (22 20:42 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Aug 2013 18:42:15 +0000 (22 20:42 +0200)
tree5450c65192f55d1f8649cf97584d5f589053d0de
parentef581ca7da4e9903cad73837cd451fd969adcdbd
parent2649579468273544ead2ed1c16b224a75ec3a895
merge from trunk
src/lisp.h