Merge branch 'wheezy'
authorZeljko Boros <Zeljko.Boros@carnet.hr>
Mon, 11 Nov 2013 15:29:55 +0000 (16:29 +0100)
committerZeljko Boros <Zeljko.Boros@carnet.hr>
Mon, 11 Nov 2013 15:29:55 +0000 (16:29 +0100)
Merge


Trivial merge