r3950 sync with maintenance

diff --git a/ChangeLog b/ChangeLog
index 2b6293e..8f953d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,9 @@
        bugfix: attribute map editor was broken (#353)
        bugfix: speed up IPv4 VLAN selector (by Boris Lytochkin)
        bugfix: suppress inputs borders in MSIE (by Alexey Andrianov)
-       bugfix: justify table alignment in rack view (#367)
        bugfix: handle locking failure in LDAP caching code
        bugfix: enable deletion of initialized 802.1Q switch
+       bugfix: justify table alignment in rack view (#367)
        update: allow scrollbars in port selector (#361)
        update: make IPv4 utilization bar a standard element (by Alexey Andrianov)
        update: make 802.1Q VLANs searchable