tree ee69b8872cf8c295a48244280c82d98e191111ab
parent 6b6f287a33ae8c340f97fb08ed95b6687e2baa4b
author Michal Simek <monstr@monstr.eu> 1190585317 +0200
committer Michal Simek <monstr@monstr.eu> 1190585317 +0200

synchronizition with mainline