Merge branch 'master' into design-docs
commit96b626fb0154473a4f005eb14efbd68b3cb42b18
authorStefan Kögl <stefan@skoegl.net>
Fri, 18 May 2012 15:03:49 +0000 (18 17:03 +0200)
committerStefan Kögl <stefan@skoegl.net>
Fri, 18 May 2012 15:03:49 +0000 (18 17:03 +0200)
treeae8af1495a9bc1aca01889917ea0f064beb6e0fe
parente5db53f98548760df8524950fa8eb4aca9c572ff
parentc2cb3706c651e5db14b45909ae0fc25ee939852a
Merge branch 'master' into design-docs