Merge tag 'upstream/0.2.0'
authorBdale Garbee <bdale@gag.com>
Wed, 10 Oct 2012 14:47:31 +0000 (08:47 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Oct 2012 14:47:31 +0000 (08:47 -0600)
commit9c82f6690f6bdae0123014bafc83836a621c5ddc
tree4ac9ed78314dc294d88c04406643cea528aa5ec9
parent4a8595c40100e3f8065fa17618bcc283c7ece92c
parent666fb9303a869710aab62228254f25fc0e5c7302
Merge tag 'upstream/0.2.0'

Upstream version 0.2.0