Merge branch '1.2.x'
commit5ea147fb6520dcc36f07705a012d87db019d8c6a
authorThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:34:09 +0000 (19 15:34 -0400)
committerThomas Harning Jr <harningt@gmail.com>
Fri, 19 Sep 2014 19:34:09 +0000 (19 15:34 -0400)
tree9942aaecf00ac5db73f6aed3ff78228b4481b0ae
parentb2fcf6f6da0151399c517e7f284ac6f6ce0d7886
parent33e903b0969c2c039e717cfcd29f11e1a0585d6a
Merge branch '1.2.x'

* 1.2.x:
  base: adds travis-ci build file
  base: updates lunit tests to pass through interpreter