pop

diff --git a/meta b/meta
index 5077abfd246013e112aff18735a104d5b406143e..0af344bc2b481ddc04d9f18fed7f7c602c60913f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 94ac1f7521c4ff55045f67ee3ef95e2d897945ca
-Head: 91fd5f444591ae8691a5bcf155467d0e7c493963
+Previous: aa7e955efb0dc1988b160b646f57ac24cfcda9e2
+Head: a5a3ee3fd023e2542c4383336460223dfd1edee0
 Applied:
   daemon: 32ca7dbd7bb04dabb504faa3ffe319e5f965d716
   cfg: 91fd5f444591ae8691a5bcf155467d0e7c493963
+  log: a5a3ee3fd023e2542c4383336460223dfd1edee0
 Unapplied:
   typo: 7a031966f6f1a9c54c3eb61aa65886c751a42da4
-  log: cbe50bfc0ec5aa61f08083722d2b3d53791195a9
 Hidden:

diff --git a/patches/log b/patches/log
index 1640f679a6fa5dcaa8c54a5595c68f6f492cd45b..8fdce767e84616b59e31c4e9fadc986d7f69308d 100644 (file)
--- a/patches/log
+++ b/patches/log
@@ -1,5 +1,5 @@
-Bottom: a9a7ff03d17186f855af81adb232170085e921d9
-Top:    5eb5beda6d0737d1fbf28c45ce124587a185a91a
+Bottom: 3d9238d760c3f6458939674d7c9d6e3cd9ccd553
+Top:    52ee28c1f875bdbba14f57bd93c52d4be6508d35
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-28 16:35:30 -0700
 
@@ -31,7 +31,7 @@ index 95ac15a..52a362f
  # log_level:\r
  # Indicates the amount of detailed data written to the log file.  Log levels\r
 diff --git a/src/acme.c b/src/acme.c
-index 03e96ad..adf8d1f 100755
+index 03e96ad..adf8d1f 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -91,9 +91,9 @@ static void gen_opts_temp(FILE *f)