Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 6 Dec 2012 22:46:06 +0000 (23:46 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 6 Dec 2012 22:46:06 +0000 (23:46 +0100)
commit458f38eb0236dcd411a1da4f5a995b06430fb059
tree6a3a6c69716e85750a9a03f5674fbd7a2cd9581e
parente1599e03160b77d26f8f0ab70c6bdb3c3597d5b9
parentd6494a973444b73361836ef1f2d66bd895903fff
Merge branch 'master' into release