Merged changes from master
commit52cdd3b0010b36679eda429f838c66d2da4871bb
authorBastian Eicher <bastian@eicher.net>
Sat, 26 Mar 2011 14:43:32 +0000 (26 15:43 +0100)
committerBastian Eicher <bastian@eicher.net>
Sat, 26 Mar 2011 14:43:32 +0000 (26 15:43 +0100)
treefafb98fe9f024ca88e17c9f10a98fb135afc69b6
parent0b91c7048124d41eefaef67e9b6d929a295ed5fa
parentb33f8601e74d274318785ea1501e1bfbc5fffe01
Merged changes from master
zeroinstall/injector/distro.py
zeroinstall/injector/model.py