Merged changes from master
commit0b91c7048124d41eefaef67e9b6d929a295ed5fa
authorBastian Eicher <bastian@eicher.net>
Sun, 13 Mar 2011 14:25:34 +0000 (13 15:25 +0100)
committerBastian Eicher <bastian@eicher.net>
Sun, 13 Mar 2011 14:25:34 +0000 (13 15:25 +0100)
treeb7907e6053a36efeebd220807d8bf1a7b4d5de6c
parent357580debe3951aba92492a32ea148b9951a890f
parente5b73b7d0e0c9c00fa74f4013e5653c7f2059e97
Merged changes from master
zeroinstall/injector/model.py
zeroinstall/injector/trust.py