Merge remote-tracking branch 'levitte/master'
authorJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 18:12:14 +0000 (14:12 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 30 Mar 2011 18:12:14 +0000 (14:12 -0400)
commit02d30b1552886540be94d5066e16c06f02e348d3
tree60d9a0a83acb1221047a4b3f8fedca7e326fa9fe
parent5bdc7f4645a95e2a661729e1bb61c7ca0dccde6a
parent9b5a5c1823ca35f0e9f6e8c8d3bc2b49d7af2403
Merge remote-tracking branch 'levitte/master'