Am 13.09.2015 um 17:45 schrieb Marco van de Voort: > In our previous episode, Florian Kl?mpfl said: >>>> Could be fixed in "fixes" too? >>> >>> I don't know. Florian, do you know the revision and is it mergeable? >>> >> >> I think r29636. It looks mergable to me. > > Conflict on the is_dfa IF, must be done/resolved by hand. Merged.