Merge branch '1.0.x'
authorDejan Jovanović <dejan@cs.nyu.edu>
Sat, 22 Dec 2012 00:14:45 +0000 (19:14 -0500)
committerDejan Jovanović <dejan@cs.nyu.edu>
Sat, 22 Dec 2012 00:14:45 +0000 (19:14 -0500)
commit7ce4d047670810a10a3f0fc202cd7d94bb4b7e69
treead7eb957617e6f94e5358136ee7095cbeb4e13bd
parentb53db2d3718368d25dec563ecf33a909ad8548f7
parentd1cd7732b17b280ad17d12a84399ff05cd1d77c4
Merge branch '1.0.x'