gnucash-docs master: Merge branch 'maint'

[John Ralls]

  discards  https://github.com/Gnucash/gnucash-docs/commit/4f744a28 (commit)
  discards  https://github.com/Gnucash/gnucash-docs/commit/4b8f99eb (commit)
Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/3c6247ea (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (https://github.com/Gnucash/gnucash-docs/commit/4f744a28)
            \
             N -- N -- N (https://github.com/Gnucash/gnucash-docs/commit/3c6247ea)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.



commit 3c6247ea7fd0cb9616aa68ff55caf7b24ad185ca
Merge: 91be847 eded1c2
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 20 13:51:03 2017 -0700

    Merge branch 'maint'



Summary of changes:
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)