Merge branch 'master' into blub/bc3
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:46:59 +0000 (11:46 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:46:59 +0000 (11:46 +0200)
commitc1e305088e80447811ff54b978d5aef65d4b164e
tree6996669e8eb620e927c96a15fb2c03a66ffa0ef1
parentcbaf9095ceba90ce478dbbf6070089ee8b14b308
parent48d330a1e9271dbd59564469fb4ce90d84f84f24
Merge branch 'master' into blub/bc3
ir.c