From: Chris Sharp <csharp@georgialibraries.org>
Date: Mon, 14 Jul 2014 16:53:07 +0000 (-0400)
Subject: Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ubuntu-14-04... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a0d9851beef9b5282f0932f563fc3b7913cfcf63;p=working%2FEvergreen.git

Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ubuntu-14-04-makefile-signoff

Conflicts:
	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
	docs/installation/server_installation.txt
---

a0d9851beef9b5282f0932f563fc3b7913cfcf63
diff --cc docs/installation/server_installation.txt
index b8f9943948,f7c2fd8321..ac57a3a076
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@@ -319,7 -307,7 +306,6 @@@ a2ensite eg.con
  a2dissite 000-default  # OPTIONAL: disable the default site (the "It Works" page)
  a2ensite eg.conf
  ------------------------------------------------------------------------------
- 
 -+
  8. (Ubuntu): As the *root* Linux account, enable Apache to write
     to the lock directory; this is currently necessary because Apache
     is running as the `opensrf` user: