Updated hold-for-merge

- Legacy-Id: 10181
This commit is contained in:
Henrik Levkowetz 2015-10-10 11:41:41 +00:00
parent 9fa41c42a3
commit 34a7df494f

View file

@ -2,8 +2,8 @@
branch/iola/automatic-doc-name-search-r10126 @ 10158
branch/iola/docalias-primary-key-r10101 @ 10111
branch/amsl/liaisons/6.4.1 @ 10160 # Merged separately
branch/amsl/liaisons@10160 # Merged as branch/amsl/liaisons/6.4.1 @ 10160
personal/lars/6.2.1.dev0@9970 # Requires the timeline work
personal/lars/6.0.5.dev0@9734 # Obsoleted - don't use 'bleach'
personal/lars/6.0.5.dev0@9732 # Already fixed in a different merge