Merge heads
authorPetri Lehtinen <petri@digip.org>
Sat, 5 Nov 2011 20:00:14 +0000 (22:00 +0200)
committerPetri Lehtinen <petri@digip.org>
Sat, 5 Nov 2011 20:00:17 +0000 (22:00 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge