From f1634087ea8a852b58ec13d5099e94771ed80849 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 12 May 2014 08:47:22 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

---
 server/conf/php_fpm_pool.conf.master |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index a7a4c64..7f5c8e1 100644
--- a/server/conf/php_fpm_pool.conf.master
+++ b/server/conf/php_fpm_pool.conf.master
@@ -8,7 +8,7 @@
 listen = <tmpl_var name='fpm_socket'>
 listen.owner = <tmpl_var name='fpm_user'>
 listen.group = <tmpl_var name='fpm_group'>
-listen.mode = <tmpl_vare name='fpm_listen_mode'>
+listen.mode = <tmpl_var name='fpm_listen_mode'>
 </tmpl_if>
 
 user = <tmpl_var name='fpm_user'>

--
Gitblit v1.9.1