Merge branch 'wip-MDL-28191-master'
authorPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:45:40 +0000 (16:45 +0200)
committerPetr Skoda <commits@skodak.org>
Mon, 25 Jul 2011 14:45:40 +0000 (16:45 +0200)
commitd39afd96ffc439a5920efce41954bfbd40ec22e6
tree484786aeb0487b966d5fe05c2a2fa9910a5db91f
parent95a1cb245cd1c63a9fe50c20d4e80fc58d9e8900
parent0e01784c44c21ca90133e5f0c4e019cf0700c802
Merge branch 'wip-MDL-28191-master'