Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Sun, 2 Oct 2011 10:11:18 +0000 (12:11 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sun, 2 Oct 2011 10:11:18 +0000 (12:11 +0200)
commit175d5c4f566f7e978aeb137f8721c5ec5fa90fd3
treecb8daeb0047ce873052283cd355ec416e436a949
parentb788fdd367b8c02f373dc5d28d73edf102787e42
parenta9bb5b56e2e634d9b7570786c41a613b7bf1397a
Merge branch 'master' into release