Merge branch 'exp-trust' into dev
commit3a729a63ba763ae5dfd68f918e8cf542cf92e1f5
authorPasqualino Ferrentino <lino@bricioline.it>
Mon, 27 Aug 2007 11:12:00 +0000 (27 13:12 +0200)
committerPasqualino Ferrentino <lino@bricioline.it>
Mon, 27 Aug 2007 11:12:00 +0000 (27 13:12 +0200)
tree6fdcbc34186f07fdc8e2a5623514a29365023027
parent92d3d55e6c4548f040ab61d522bed5129ebd225f
parent56d6b60686a2c0f4101a945e516ca504e7439d6d
Merge branch 'exp-trust' into dev