Merge branch 'master' of ssh://repo.or.cz/srv/git/bitfountainmaster
commit45f18872bdff9e13376967b1e679dd989a9d85e2
authornddrylliog <nddrylliog@gmail.com>
Tue, 25 May 2010 20:48:53 +0000 (25 22:48 +0200)
committernddrylliog <nddrylliog@gmail.com>
Tue, 25 May 2010 20:48:53 +0000 (25 22:48 +0200)
treed850b9f0dcf4068ff1bc1bcf840f9de43f8ca354
parent20c75ab2624f6af7778ff2d00c9af45a519a2731
parentc4a6dacee282f031a7906853ef777974194b085f
Merge branch 'master' of ssh://repo.or.cz/srv/git/bitfountain