Merge branch 'lazy-floenv'
authorTaylor R Campbell <campbell@mumble.net>
Thu, 20 Jun 2013 15:46:19 +0000 (15:46 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Thu, 20 Jun 2013 15:46:19 +0000 (15:46 +0000)
commitd1de51b645c10446e4100f2a669625eaf1093079
tree082316c81a640f9accf18c514b00d97f9640b613
parent9a81c86bd32f3f497f31e3e58a3bdf27d1977b64
parentf78c2f581b6ab8086c1ef636b078057ee6def823
Merge branch 'lazy-floenv'