Merge.
authordl-taktik <dl@taktik.be>
Wed, 22 May 2013 07:57:26 +0000 (09:57 +0200)
committerdl-taktik <dl@taktik.be>
Wed, 22 May 2013 07:57:26 +0000 (09:57 +0200)
commitb0d479318f246a5cee8899c3943e372a53c4cdbb
treeefd74313361d85c991b973a5d0840c9aba977bfa
parent3f06ab402efa96dd11915b44bb70ff49c2bc053f
parent80c3ef578ee0f6866b41a60e82e58c1286ae1616
Merge.

bzr revid: dl@taktik.be-20130522075726-hj5gnvp27381jvlm