merge of 657428f7610ffe279e57ccd9a34630fcb0db722f

     and 7a1a1d1dc2d072ab7829bb7c3314d4604d4445d6

diff --cc conf/tinder.conf
index 00cb7fa,f2bf88c..bb28bb3
--- 1/conf/tinder.conf
--- 2/conf/tinder.conf
+++ b/conf/tinder.conf
@@@ -18,5 -19,3 +19,4 @@@ INHERIT          += "tinderclient
  #TINDER_FROM       = "you@yourhost"
  #TINDER_REPORT     = "1"
  
- 
 +TINDER_START     := "${@time.strftime('%m/%d/%Y %H:%M:%S', time.localtime())}"