Sun, 01 Apr 2012 23:21:54 +0200 krauss merged, manually resolving conflicts due to session renaming (cf. 6488c5efec49)
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip