Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jul 2012 18:09:57 +0000 (20:09 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 27 Jul 2012 18:09:57 +0000 (20:09 +0200)
commitb0a5e4fc9b66620b00f937f7e9a406bf22aaaf1d
treea5f00e162e1a688a712102837997ba9cffe4a0f0
parentcd67a2745661905fef6a462499a74bcc091a5fa6
parentf8edb2973d37f3ebfd08291f28be5435d0cf8f64
Merge branch 'master' into release