Merge branch 'master' into blub/bc3
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:32:12 +0000 (11:32 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:32:12 +0000 (11:32 +0200)
commitcbaf9095ceba90ce478dbbf6070089ee8b14b308
treea76b556d265335a84617e5aec911f2740f5038f7
parentce082551d8538fea703968d23d68b805ee530132
parentb5bee640d0ee61f5c68def55d597dccdc63eee07
Merge branch 'master' into blub/bc3