Merge branch 'release'
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 11 Nov 2011 19:55:46 +0000 (20:55 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 11 Nov 2011 19:55:46 +0000 (20:55 +0100)
commita295b92eef56d2db81910bc1939fea14467d29e5
treec0495322e289c369b2ca0dc6dfefe7217e5cbb7c
parentc6b7b98bab9b0e7b8a278fd07a296467cc01ffff
parentf0197d4f74f204df28c96dd789edb0984cd979db
Merge branch 'release'