Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 4 Feb 2013 23:11:40 +0000 (18:11 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 4 Feb 2013 23:11:40 +0000 (18:11 -0500)
1  2 
src/main/util.cpp

Simple merge