Merge branch 'master_MDL-10707'
authorPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:59:42 +0000 (15:59 +0200)
committerPetr Skoda <commits@skodak.org>
Tue, 2 Aug 2011 13:59:42 +0000 (15:59 +0200)
commit1f5be6fbcd8d7fe0ded11d177f394d53ace26061
tree74c8c706e66406bf430094f60ce2f0e77bbbc43d
parent6179c38af54d1d84d6fb11ec27a6f4aadc665b0a
parent07dbbdde39a74eee4e3a3e5aff2d7d5fdb3def46
Merge branch 'master_MDL-10707'