Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 31 Oct 2014 19:11:22 +0000 (20:11 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 31 Oct 2014 19:11:22 +0000 (20:11 +0100)
commit2a80b46be78e9d849de223ab73b6f3e7b4d9fc46
tree87879ec2a3ea024ae5c9785e190819cc7cf0c572
parentb45bdacdeee5c96e0294717fbe2c47a49a110fd1
parentf3dbed65944495c5f7b2c85bae54e2eefcda4eca
Merge branch 'master' into release