Alpar Juttner <alpar@cs.elte.hu> [Fri, 22 Jun 2012 16:25:56 +0200] rev 787
 
Bugfix in path copy constructors and assignment operators (#444)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 06 May 2012 16:46:14 +0200] rev 786
 
Merge bugfix #441 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Sat, 05 May 2012 10:22:44 +0200] rev 785
 
Fix buggy reinitialization in _solver_bits::VarIndex::clear() (#441)
 - In addition, rows.clear() and cols.clear() are moved up to LpBase::clear()
Alpar Juttner <alpar@cs.elte.hu> [Fri, 20 Jan 2012 19:16:43 +0100] rev 784
 
Merge Intel C++ compatibility fixes to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Thu, 19 Jan 2012 15:25:06 +0100] rev 783
 
Intel C++ compatibility fixes
Alpar Juttner <alpar@cs.elte.hu> [Wed, 11 Jan 2012 13:58:30 +0100] rev 782
 
Merge LP interface updates to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Fri, 06 Jan 2012 16:27:06 +0100] rev 781
 
Make CBC interface compatible with latest CBC releases
CBC now uses the CLP backend unconditionally
Alpar Juttner <alpar@cs.elte.hu> [Sat, 24 Dec 2011 01:15:59 +0100] rev 780
 
Update CPLEX lookup
 - References to explicit CPLEX version 9.1 have been removed
 - Library file name must either be 'cplex.a' or 'cplex.dll'
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 19:37:25 +0100] rev 779
 
Merge #432 and #433 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 19:33:51 +0100] rev 778
 
Support shared library build (#433)
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 19:21:08 +0100] rev 777
 
Add missing doc/template.h to release tarball (#432)
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 18:59:35 +0100] rev 776
 
Merge head merging to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 17:44:38 +0100] rev 775
 
Merge
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 17:43:11 +0100] rev 774
 
Merge
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 17:38:19 +0100] rev 773
 
Merge
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 17:36:41 +0100] rev 772
 
Merge
Alpar Juttner <alpar@cs.elte.hu> [Tue, 20 Dec 2011 17:35:45 +0100] rev 771
 
Merge
Alpar Juttner <alpar@cs.elte.hu> [Wed, 09 Nov 2011 11:38:38 +0100] rev 770
 
LEMON 1.1.5 released (74e2dac774c8 tagged as r1.1.5)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 09 Nov 2011 11:29:01 +0100] rev 769
 
Unify sources
Alpar Juttner <alpar@cs.elte.hu> [Wed, 09 Nov 2011 11:26:01 +0100] rev 768
 
Update NEWS file
Alpar Juttner <alpar@cs.elte.hu> [Tue, 01 Nov 2011 13:43:20 +0100] rev 767
 
Merge bugfix #430 to branch 1.1
Gabor Retvari <retvari@tmit.bme.hu> [Tue, 01 Nov 2011 08:24:30 +0100] rev 766
 
Fix LpBase::Constr two-side limit bug (#430)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 24 Oct 2011 21:39:34 +0200] rev 765
 
Merge #428 and #429 to branch 1.1
Peter Kovacs <kpeter@inf.elte.hu> [Sun, 23 Oct 2011 22:49:04 +0200] rev 764
 
Fix VS warnings (#429)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 05 Oct 2011 12:02:56 +0200] rev 763
 
Add lemon/lemon.pc.cmake to the release tarball (#428)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 08 Aug 2011 13:35:38 +0200] rev 762
 
LEMON 1.1.4 released (f1398882a928 tagged as r1.1.4)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 08 Aug 2011 12:36:16 +0200] rev 761
 
Unify sources
Alpar Juttner <alpar@cs.elte.hu> [Fri, 05 Aug 2011 09:33:42 +0200] rev 760
 
Update NEWS file
Alpar Juttner <alpar@cs.elte.hu> [Thu, 04 Aug 2011 22:02:20 +0200] rev 759
 
Merge AUTHORS file update to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Thu, 04 Aug 2011 22:00:57 +0200] rev 758
 
Update the AUTHORS file
Alpar Juttner <alpar@cs.elte.hu> [Thu, 04 Aug 2011 21:19:55 +0200] rev 757
 
Merge #382 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Tue, 02 Aug 2011 18:13:34 +0200] rev 756
 
Allow lgf file without Arc maps (#382)
A single '-' character in the @arcs sectio header indicates that
there is no arc map.
Alpar Juttner <alpar@cs.elte.hu> [Wed, 13 Jul 2011 14:40:05 +0200] rev 755
 
Merge #419 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Wed, 13 Jul 2011 14:38:50 +0200] rev 754
 
Do not look for COIN_VOL libraries
Alpar Juttner <alpar@cs.elte.hu> [Fri, 15 Apr 2011 09:40:17 +0200] rev 753
 
Also search for coin libs under ${COIN_ROOT_DIR}/lib/coin (#419)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 15 Apr 2011 09:37:47 +0200] rev 752
 
Build of mip_test and lp_test precede the running of the tests (#419)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 15 Apr 2011 09:26:09 +0200] rev 751
 
Merge GLPK fix #337 with CMAKE improvements
Alpar Juttner <alpar@cs.elte.hu> [Tue, 12 Apr 2011 07:46:34 +0200] rev 750
 
Merge #418 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Thu, 07 Apr 2011 16:57:35 +0200] rev 749
 
Better Win CodeBlock/MinGW support (#418)
 - Remove -ansi compilation flag
 - Don't include sys/times.h when WIN32 is defined
Alpar Juttner <alpar@cs.elte.hu> [Thu, 17 Mar 2011 18:12:57 +0100] rev 748
 
Merge #416 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Mon, 14 Mar 2011 08:56:54 +0100] rev 747
 
Support tests with valgrind (#416)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 04 Mar 2011 11:22:50 +0100] rev 746
 
Merge #404 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Fri, 04 Mar 2011 10:31:12 +0100] rev 745
 
Remove doc header (show version number on the main page) (#404)
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 21 Jan 2011 22:04:22 +0100] rev 744
 
Update Doxygen config files + enable search (#404)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 04 Mar 2011 10:40:19 +0100] rev 743
 
Merge CMAKE and Doxygen backports to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Wed, 25 Aug 2010 21:34:58 +0200] rev 742
 
Backport the CMAKE related changesets from the main branch
[e20fecd1945f] Add check target for CMake (#388)
[e74b5db4f2c6] Put the output of chg-len.py in the version string (#389)
[7d166b8b8018] Safer call of ./scripts/chg-len.py on Windows (#389)
[659ba4805a48] Make CMAKE config more consistent with configure.ac (#390)
[63e4468c680e] Add 'Maintainer' CMAKE build type (#388, #390)
[a725503acfe9] Allow CPACK configuration on all platforms
[10242c611190] Create and install lemon.pc (#393)
[48e29534cf03] The deafult target doesn't build lp_test and mip_test (#388)
[0fbbdd578c06] Full path for DoxygenLayout.xml in Doxyfile.in (#395)
[481496e6d71f] SOURCE_BROWSER Doxygen switch is configurable from CMAKE (#395)
[09282720100b] update-external-tags CMAKE target (#395)
Alpar Juttner <alpar@cs.elte.hu> [Sat, 10 Oct 2009 08:19:26 +0200] rev 741
 
Backport [53bea38f71cb] 'Update Doxygen configuration file'
Alpar Juttner <alpar@cs.elte.hu> [Mon, 28 Feb 2011 09:50:33 +0100] rev 740
 
Merge bugfix #414 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Fri, 25 Feb 2011 21:37:47 +0100] rev 739
 
Fix wrong initialization in Preflow (#414)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 22 Sep 2010 09:26:01 +0200] rev 738
 
Merge bugfix #392 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Wed, 22 Sep 2010 08:53:09 +0200] rev 737
 
Bug fix in Dfs::start(s,t) (#392)
Alpar Juttner <alpar@cs.elte.hu> [Tue, 21 Sep 2010 06:28:35 +0200] rev 736
 
LEMON 1.1.3 released (dfdb58f52f02 tagged as r1.1.3)
Alpar Juttner <alpar@cs.elte.hu> [Tue, 21 Sep 2010 06:01:30 +0200] rev 735
 
Update NEWS file
Alpar Juttner <alpar@cs.elte.hu> [Fri, 25 Jun 2010 06:15:43 +0200] rev 734
 
Merge bugfix #371 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Fri, 25 Jun 2010 05:48:27 +0200] rev 733
 
Merge bugfix #372 to branch 1.1
Balazs Dezso <deba@inf.elte.hu> [Thu, 24 Jun 2010 09:27:53 +0200] rev 732
 
Fix critical bug in preflow (#372)
The wrong transition between the bound decrease and highest active
heuristics caused the bug. The last node chosen in bound decrease mode
is used in the first iteration in highest active mode.
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 22 Jun 2010 15:39:26 +0200] rev 731
 
Bug fix in (di)graphCopy() (#371)
The target graph is cleared before adding nodes and arcs/edges.
Alpar Juttner <alpar@cs.elte.hu> [Mon, 03 May 2010 10:16:01 +0200] rev 730
 
Merge bugfix #368 to branch 1.1
Peter Kovacs <kpeter@inf.elte.hu> [Sun, 02 May 2010 18:53:56 +0200] rev 729
 
Fix the usage of min() (#368)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 12 Apr 2010 16:52:48 +0200] rev 728
 
Merge bugfix #366 to branch 1.1
Balazs Dezso <deba@inf.elte.hu> [Mon, 12 Apr 2010 13:59:41 +0200] rev 727
 
Fix PredMatrixMapPath::empty() (#366)
Gabor Retvari <retvari@tmit.bme.hu> [Sun, 11 Apr 2010 22:28:42 +0200] rev 726
 
Fix PredMapPath::empty() (#366)
Alpar Juttner <alpar@cs.elte.hu> [Tue, 06 Apr 2010 06:43:04 +0200] rev 725
 
Merge bugfix #364 to branch 1.1
Peter Kovacs <kpeter@inf.elte.hu> [Mon, 05 Apr 2010 23:33:57 +0200] rev 724
 
Add missing UndirectedTags (#364)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 17 Mar 2010 10:23:17 +0100] rev 723
 
Merge bugfix #356 to branch 1.1
Balazs Dezso <deba@inf.elte.hu> [Tue, 16 Mar 2010 21:12:10 +0100] rev 722
 
Fix multiple execution bug in weighted matchings (#356)
This chgset also redoes the fix of [28c7ad6f8d91] and its backpont to 1.1,
[268a052c3043].
Alpar Juttner <alpar@cs.elte.hu> [Sun, 07 Mar 2010 09:49:42 +0000] rev 721
 
LEMON 1.1.2 released (86a880ba752d tagged as r1.1.2)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 07 Mar 2010 09:42:47 +0000] rev 720
 
Update NEWS file
Alpar Juttner <alpar@cs.elte.hu> [Wed, 03 Mar 2010 16:00:08 +0000] rev 719
 
Merge bugfixes #323 to branch 1.1
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 15 Oct 2009 21:04:50 +0200] rev 718
 
Remove unnecessary integer requirement in Suurballe (#323)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 15 Oct 2009 21:03:17 +0200] rev 717
 
Bug fix in Suurballe (#323)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 26 Feb 2010 17:08:30 +0100] rev 716
 
Merge 4 backouts (#50, #312)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 26 Feb 2010 17:07:13 +0100] rev 715
 
Back out 4 changesets (#50, #312)
 - 532697c9fa53
 - bb8c4cd57900
 - 9f529abcaebf
 - 703ebf476a1d
Alpar Juttner <alpar@cs.elte.hu> [Sun, 21 Feb 2010 18:55:01 +0100] rev 714
 
Merge bugfix #336 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Thu, 11 Feb 2010 10:02:11 +0100] rev 713
 
Fix the date field comment of graphToEps() output (#336)
Balazs Dezso <deba@inf.elte.hu> [Sun, 14 Feb 2010 23:12:59 +0100] rev 712
 
Merge bugfix #337 to branch 1.1
Balazs Dezso <deba@inf.elte.hu> [Sun, 14 Feb 2010 23:10:24 +0100] rev 711
 
Use void* like LPX object (#337)
Balazs Dezso <deba@inf.elte.hu> [Thu, 10 Dec 2009 09:14:47 +0100] rev 710
 
Fix clear() function in ExtendFindEnum (#335), backport of [28c7ad6f8d91]
Alpar Juttner <alpar@cs.elte.hu> [Thu, 10 Dec 2009 17:10:25 +0100] rev 709
 
Merge bugfix #330 to branch 1.1
Alpar Juttner <alpar@cs.elte.hu> [Thu, 10 Dec 2009 17:05:35 +0100] rev 708
 
Merge
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 13 Nov 2009 12:33:33 +0100] rev 707
 
Bug fix in map_extender.h (#330)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 20 Aug 2009 20:34:30 +0200] rev 706
 
Also check ReferenceMapTag in concept checks (#312)
Balazs Dezso <deba@inf.elte.hu> [Thu, 11 Jun 2009 23:13:24 +0200] rev 705
 
Unification of names in heaps (#50)
Balazs Dezso <deba@inf.elte.hu> [Thu, 11 Jun 2009 22:16:11 +0200] rev 704
 
Simplified implementation of bucket heaps (#50)
Balazs Dezso <deba@inf.elte.hu> [Thu, 11 Jun 2009 22:11:29 +0200] rev 703
 
Port remaining heaps from SVN -r 3509 (#50)
 - FibHeap
 - RadixHeap
 - BucketHeap
 - SimpleBucketHeap
Alpar Juttner <alpar@cs.elte.hu> [Thu, 05 Nov 2009 16:01:39 +0100] rev 702
 
Merge fix #321
Peter Kovacs <kpeter@inf.elte.hu> [Fri, 16 Oct 2009 10:21:37 +0200] rev 701
 
Use pathCopy(from,to) instead of copyPath(to,from) (#321)
The old version is kept as a deprecated alternative.
Alpar Juttner <alpar@cs.elte.hu> [Mon, 12 Oct 2009 17:01:03 +0100] rev 700
 
Merge bugfix #322
Akos Ladanyi <ladanyi@tmit.bme.hu> [Mon, 12 Oct 2009 16:37:22 +0100] rev 699
 
Distribute LEMONConfig.cmake.in (#322)
Alpar Juttner <alpar@cs.elte.hu> [Mon, 12 Oct 2009 15:30:18 +0100] rev 698
 
Merge bugfix in #250
Peter Kovacs <kpeter@inf.elte.hu> [Mon, 12 Oct 2009 13:41:15 +0200] rev 697
 
Fix in pathSource() and pathTarget() (#250)
and extend the doc.
Alpar Juttner <alpar@cs.elte.hu> [Mon, 05 Oct 2009 20:21:31 +0200] rev 696
 
Merge #317
Balazs Dezso <deba@inf.elte.hu> [Wed, 30 Sep 2009 11:17:00 +0200] rev 695
 
Remove unnecessary OsiCbc dependency (#317)
Alpar Juttner <alpar@cs.elte.hu> [Sun, 27 Sep 2009 09:47:20 +0200] rev 694
 
Fix (and improve) error message in mip_test.cc (#317)
Alpar Juttner <alpar@cs.elte.hu> [Sat, 03 Oct 2009 07:32:04 +0200] rev 693
 
LEMON 1.1.1 released (78b7231f0b2e tagged as r1.1.1)
Alpar Juttner <alpar@cs.elte.hu> [Sat, 03 Oct 2009 06:54:18 +0200] rev 692
 
Update NEWS file
Alpar Juttner <alpar@cs.elte.hu> [Mon, 31 Aug 2009 07:05:13 +0200] rev 691
 
Merge bugfix #307
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 18 Aug 2009 10:24:31 +0200] rev 690
 
Bug fix in Preflow and Circulation (#307)
Alpar Juttner <alpar@cs.elte.hu> [Thu, 20 Aug 2009 22:45:40 +0200] rev 689
 
Merge bugfix #311
Alpar Juttner <alpar@cs.elte.hu> [Thu, 20 Aug 2009 22:41:40 +0200] rev 688
 
Merge bugfix #302
Akos Ladanyi <ladanyi@tmit.bme.hu> [Tue, 18 Aug 2009 21:39:35 +0100] rev 687
 
Remove duplicate list_graph.h entry from source list (#308)
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 20 Aug 2009 18:37:36 +0200] rev 686
 
Add missing 'explicit' keywords (#311)
Alpar Juttner <alpar@cs.elte.hu> [Fri, 24 Jul 2009 10:43:12 +0100] rev 685
 
Merge bugfix #302
Peter Kovacs <kpeter@inf.elte.hu> [Thu, 23 Jul 2009 18:09:41 +0200] rev 684
 
Fix the implementation and doc of CrossRefMap (#302)
 - Handle multiple values correctly with std::multimap.
 - Clarify the problematic points in the doc.
 - Add some basic tests for the class.
Alpar Juttner <alpar@cs.elte.hu> [Mon, 01 Jun 2009 17:49:43 +0100] rev 683
 
Merge several CMAKE related improvements
Akos Ladanyi <ladanyi@tmit.bme.hu> [Fri, 29 May 2009 17:46:48 +0100] rev 682
 
Set the version to 'hg-tip' if everything fails
Akos Ladanyi <ladanyi@tmit.bme.hu> [Fri, 29 May 2009 12:44:37 +0100] rev 681
 
Minor CMake improvements
* Use the empty ELSE(), ENDIF(), ENDMACRO(), etc. syntax since this improves
  readability and requires less typing.
* Use FIND_PACKAGE() instead of INCLUDE().
* Use the value of CMAKE_COMMAND variable instead of cmake, since this works
  even if cmake is not in the PATH.
Akos Ladanyi <ladanyi@tmit.bme.hu> [Fri, 29 May 2009 11:40:53 +0100] rev 680
 
Put the version string into config.h
Also make it possible to set the version using the LEMON_VERSION environment
variable, and use the hg revision as version string in case this variable is
unset.
Akos Ladanyi <ladanyi@tmit.bme.hu> [Fri, 29 May 2009 10:35:05 +0100] rev 679
 
Fix the check for the 'long long' type
Akos Ladanyi <ladanyi@tmit.bme.hu> [Thu, 28 May 2009 19:46:43 +0100] rev 678
 
Change the label of the html project in Visual Studio
Akos Ladanyi <ladanyi@tmit.bme.hu> [Wed, 27 May 2009 20:12:08 +0100] rev 677
 
Generate and install LEMONConfig.cmake
Akos Ladanyi <ladanyi@tmit.bme.hu> [Wed, 27 May 2009 13:08:47 +0100] rev 676
 
Add tools/CMakeLists.txt to the tarball
Akos Ladanyi <ladanyi@tmit.bme.hu> [Tue, 26 May 2009 17:49:10 +0100] rev 675
 
Rename documentation install folder from 'docs' to 'html'
Akos Ladanyi <ladanyi@tmit.bme.hu> [Tue, 26 May 2009 17:47:51 +0100] rev 674
 
Remove duplications from doc/CMakeLists.txt
Alpar Juttner <alpar@cs.elte.hu> [Thu, 28 May 2009 16:59:51 +0100] rev 673
 
Merge fix #295
Akos Ladanyi <ladanyi@tmit.bme.hu> [Thu, 28 May 2009 12:11:50 +0100] rev 672
 
Suppress MSVC warnings using pragmas (#295)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 13 May 2009 09:58:09 +0100] rev 671
 
LEMON 1.1 released (06f816565bef tagged as r1.1)
Alpar Juttner <alpar@cs.elte.hu> [Wed, 13 May 2009 09:50:14 +0100] rev 670
 
Merge various fixes
Peter Kovacs <kpeter@inf.elte.hu> [Wed, 13 May 2009 10:42:26 +0200] rev 669
 
Add artificial addNode() function to the arc/edge set classes
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 12 May 2009 20:08:23 +0200] rev 668
 
Avoid Intel C++ Compiler warnings
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 12 May 2009 17:57:49 +0200] rev 667
 
Disable Visual Studio warning C4503
Alpar Juttner <alpar@cs.elte.hu> [Tue, 12 May 2009 15:55:00 +0100] rev 666
 
Add lemon/config.h.cmake to the tarball
Alpar Juttner <alpar@cs.elte.hu> [Tue, 12 May 2009 15:02:18 +0100] rev 665
 
Resolve GCC-4.4 warnings & fix ambiguous op=() in graph_components.h
Alpar Juttner <alpar@cs.elte.hu> [Tue, 12 May 2009 12:09:55 +0100] rev 664
 
Merge
Alpar Juttner <alpar@cs.elte.hu> [Tue, 12 May 2009 11:49:13 +0100] rev 663
 
Update NEWS file
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 12 May 2009 12:08:06 +0200] rev 662
 
Extend min cost flow test file + check dual costs (#291)
Peter Kovacs <kpeter@inf.elte.hu> [Tue, 12 May 2009 12:06:40 +0200] rev 661
 
Fix the GEQ/LEQ handling in NetworkSimplex + improve doc (#291)
 - Fix the optimality conditions for the GEQ/LEQ form.
 - Fix the initialization of the algortihm. It ensures correct
   solutions and it is much faster for the inequality forms.
 - Fix the pivot rules to search all the arcs that have to be
   allowed to get in the basis.
 - Better block size for the Block Search pivot rule.
 - Improve documentation of the problem and move it to a
   separate page.
Alpar Juttner <alpar@cs.elte.hu> [Mon, 11 May 2009 16:38:21 +0100] rev 660
 
Merge