Merge branch 'topic/main'
commit90165c260e77246a7fca410318630f857efefcf5
authorSteffen (Daode) Nurpmeso <sdaoden@users.sf.net>
Sat, 15 Feb 2014 14:58:41 +0000 (15 15:58 +0100)
committerSteffen (Daode) Nurpmeso <sdaoden@users.sf.net>
Sat, 15 Feb 2014 14:58:41 +0000 (15 15:58 +0100)
tree65ca3d2bfc740ee031cb907c96cefc96b467ae4a
parent726c8b0cb22d576dde3d0875bf5994bb58df0674
parentfa0a0aacd295ecd60700f5754634e02f99130428
Merge branch 'topic/main'

* topic/main:
  main()+: -f & -u mutual, -H & -u ok, -u & send mode not
  main(): don't exit(), use exit_status and control flow