Merge branch 'beamer-inheritance'
commitf1443e7a7a3df8b13ab71cbe218a7038c7fb55b8
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 22 Apr 2012 14:35:10 +0000 (22 16:35 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 22 Apr 2012 14:35:10 +0000 (22 16:35 +0200)
tree706e91fb891b2e4b537f71b91b4a61c428f3ab64
parent0b97c97170cc02e90455d9086160a35619760eae
parent6fdfa1ede1b99012ca96fac60ddb7c9f8cde8703
Merge branch 'beamer-inheritance'