Merge branch 'master' into ladi
commit3a463a6ef3c70794976d2ab9450b5f1a90e50fcf
authorNedko Arnaudov <nedko@arnaudov.name>
Mon, 28 Dec 2009 13:19:43 +0000 (28 15:19 +0200)
committerNedko Arnaudov <nedko@arnaudov.name>
Mon, 28 Dec 2009 13:19:43 +0000 (28 15:19 +0200)
tree8eb0354a65d249dd264323a98f889ae12228aef7
parent346b6829bd95e59d8d159c07af82523e1c657826
parentddc96f38f04bc4c151a495cf175a0ad65eb88d3e
Merge branch 'master' into ladi