Merge branch 'master'
commit94138b5d364ede18ed11bc28e2931bd0c32d959c
authorygrek <ygrek@autistici.org>
Tue, 4 Nov 2008 09:32:37 +0000 (4 11:32 +0200)
committerygrek <ygrek@autistici.org>
Thu, 1 Jan 2009 10:32:44 +0000 (1 12:32 +0200)
treeae181d3ee84285e6459241f6b2cdfb76647cd5a4
parentafbd13021e7d5faa4f015b480912081fddb87ac2
parent099786888fe85df40e61f20cf918e55fa6282ddb
Merge branch 'master'

Conflicts:

Makefile.config.msvc
Makefile.config.msvc