Merge pull request #1 from barak/master
authorFlorian Forster <github@nospam.verplant.org>
Sat, 27 Aug 2011 15:00:37 +0000 (08:00 -0700)
committerFlorian Forster <github@nospam.verplant.org>
Sat, 27 Aug 2011 15:00:37 +0000 (08:00 -0700)
commitdb412c89c4d3b899929d58d0eb44845cd029730a
tree48543e532324e629d222508fd4f338727bf056de
parent81eab3b646c02820d0ee87cd1f1f5950e72ec2a9
parent3b12f43ad59f26192cf824c15f38d0e6c1553fd0
Merge pull request #1 from barak/master

upstream update + tweaks