Merge remote branch 'atomic/master' into new_master
commitfd640ed910eff410a6129cabecbfd0e3d3590cda
authorTim Blechmann <tim@klingt.org>
Fri, 23 Jul 2010 09:15:33 +0000 (23 11:15 +0200)
committerTim Blechmann <tim@klingt.org>
Fri, 23 Jul 2010 09:15:33 +0000 (23 11:15 +0200)
treea4ed4cf5f03a67961063bb69ac310d2323d457ba
parent7261286bcb274ecf1293ff517c275b73a0c8a411
parent9259470683ab3d32cfa9ce646b781d8d0c8e9a5c
Merge remote branch 'atomic/master' into new_master