Merge trunk.
authorJonathan Lange <jml@mumak.net>
Sun, 25 Mar 2012 14:38:54 +0000 (15:38 +0100)
committerJonathan Lange <jml@mumak.net>
Sun, 25 Mar 2012 14:38:54 +0000 (15:38 +0100)
commit8ef201486accca05b0ded63c1d360e3c10722a03
treeb2230b4604d5971b4d2fdddcbb6ab6b00e506f94
parent6094e522b9b18c247991f02ba4ca2ce8a498d51f
parent4786a5fff6f481356f09b7b93b9361678075e489
Merge trunk.