Merge remote-tracking branch 'origin/v2' into v2
authorAndreas Scherbaum <andreas@scherbaum.biz>
Mon, 25 Jun 2012 21:28:19 +0000 (23:28 +0200)
committerAndreas Scherbaum <andreas@scherbaum.biz>
Mon, 25 Jun 2012 21:28:19 +0000 (23:28 +0200)
1  2 
docbot.pl

diff --cc docbot.pl
Simple merge