[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4a-65-g87fcb6e

[Mahyuddin Susanto]

The following commit has been merged in the master branch:
commit 87fcb6e5d2c5fbd0e379d61dca62ca9e8748afca
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date:   Fri Jan 13 10:31:29 2012 +0700

    fix typo in proftpd.conf templates line 133. (Closes: #655630)

diff --git a/debian/templates/proftpd.conf b/debian/templates/proftpd.conf
index 6ea3ef5..b8d7e66 100644
--- a/debian/templates/proftpd.conf
+++ b/debian/templates/proftpd.conf
@@ -140,7 +140,7 @@ AdminControlsEngine off
 #
 # Useful to keep VirtualHost/VirtualRoot directives separated
 #
-#Include /etc/proftpd/virtuals.con
+#Include /etc/proftpd/virtuals.conf
 
 # A basic anonymous configuration, no upload directories.
 

-- 
ProFTPD core package