Merge branch 'master' into makefiles
commitb8cd2824d9838516cb566a02fc63c02a980d2c0a
authorygrek <ygrek@autistici.org>
Mon, 20 Oct 2008 14:34:14 +0000 (20 17:34 +0300)
committerygrek <ygrek@autistici.org>
Mon, 20 Oct 2008 14:34:14 +0000 (20 17:34 +0300)
treee83bdf27ad96f350fec0b8ac178fed8d393d92f9
parenta4500c56d6293edf616cf34cb6ce381e20cf8609
parentc09656180ef0f4052b3080188afb5ffbecf813ba
Merge branch 'master' into makefiles