Merge branch 'release-0.6.6'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 3 May 2013 09:20:41 +0000 (11:20 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 3 May 2013 09:20:41 +0000 (11:20 +0200)
* release-0.6.6:
  txtinfo: prevent buffer overflow


Trivial merge