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)
commit6176e9f9550d66372f3bc3f2e557ce0a9941665f
treea5becc52364ecc89a811c4c53839f18978da859c
parent11e4f67b3fe683cfea53c898bebfd1694785d97a
parent88db30614374f39479b5c30538f4877d6c252be2
Merge branch 'wheezy'

Merge