[dev] [dexonline/dexonline] 33f340: Implement entry merging.

[GitHub via Dev]

  Branch: refs/heads/master
  Home:   https://github.com/dexonline/dexonline
  Commit: 33f340e71a231217eb38312b08040a4a640581cf
      https://github.com/dexonline/dexonline/commit/33f340e71a231217eb38312b08040a4a640581cf
  Author: Cătălin Frâncu <cata at francu.com>
  Date:   2016-09-05 (Mon, 05 Sep 2016)

  Changed paths:
    M phplib/models/Entry.php
    M templates/editEntry.tpl
    M wwwbase/editEntry.php
    M wwwbase/js/autoload/editEntry.js

  Log Message:
  -----------
  Implement entry merging.