Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Thu, 29 Sep 2011 23:35:42 +0000 (01:35 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Thu, 29 Sep 2011 23:35:42 +0000 (01:35 +0200)
commitb788fdd367b8c02f373dc5d28d73edf102787e42
tree18068638b7047b7a20b4e0d44efb1983c3e899c9
parentabbca718e0f6b5a20170561beeacafa0b5852500
parentc3f9951c6d37ad59e09305ad34dbbe8f8892f726
Merge branch 'master' into release