Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sat, 17 Nov 2012 02:23:59 +0000 (03:23 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sat, 17 Nov 2012 02:23:59 +0000 (03:23 +0100)
commit92aa0fb3b569b4678bc08d6061d3115517d54252
treeada3d7f6c66c998467b856e2469caa4ced167708
parentcf34f9fd4c28854152a995bdc9243b8a7bb893a1
parent1c8829bdd654b1cb7ed2c1bd1c7a437d5b198bcf
Merge branch 'master' into release