tree 60b6a9576e2ff626799ac513763a1973338fa06a
parent 26126b4675a30a021123c59f4acf0340bbcbadb1
parent 1e85483efea100a33df51734371a370591134d05
author David Pursehouse <dpursehouse@collab.net> 1519176007 +0900
committer David Pursehouse <dpursehouse@collab.net> 1519176007 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  SiteLibraryLoaderUtil: Add debug log of the loaded libraries
  ShowConnections: Fix display for connection time older than one day

Change-Id: I19656f0ddd8d48219af3a29c6bcee4e01897d477