[dovecot/pigeonhole] b9e567: lib-sieve: Handle extension overriding itself prop...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/dovecot/pigeonhole
  Commit: b9e567b56ab2dfb9ce10100407524b872d44b476
      https://github.com/dovecot/pigeonhole/commit/b9e567b56ab2dfb9ce10100407524b872d44b476
  Author: Stephan Bosch <stephan at dovecot.fi>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M src/lib-sieve/sieve-extensions.c

  Log Message:
  -----------
  lib-sieve: Handle extension overriding itself properly.


  Commit: 2dc13c59938eeb35a4a99c86fcd293d65e045e3d
      https://github.com/dovecot/pigeonhole/commit/2dc13c59938eeb35a4a99c86fcd293d65e045e3d
  Author: Stephan Bosch <stephan at rename-it.nl>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M src/lib-sieve/sieve-extensions.c

  Log Message:
  -----------
  Merged concurrent changes.


Compare: https://github.com/dovecot/pigeonhole/compare/850d80b2a2ee...2dc13c59938e