Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 27 Jun 2012 17:01:37 +0000 (19:01 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 27 Jun 2012 17:01:37 +0000 (19:01 +0200)
commitcd67a2745661905fef6a462499a74bcc091a5fa6
treeacb5d68e8a0ef737e42ecf2b5e93f26b957c3690
parentd968b075dd7f0a4a96175045dbf4e20b7aa32872
parentebefc26c10d68ba9ced2a30c896dccc81c6c2eeb
Merge branch 'master' into release