tree 1568d9fc5923c0e8e31ce232e289e67abd48d948
parent 1b5a85671bb28cdf87ef1c32c3d926a14a9409de
parent 2f56fba915e35bcc7a36fbc047503d777decccd5
author Andrey Andreev <narf@bofh.bg> 1332275806 +0200
committer Andrey Andreev <narf@bofh.bg> 1332275806 +0200

Merge upstream branch