Merge branch 'import' into 1.6.0

Conflicts:
	ChangeLog
	html/task.html

html/task.html

@@ -58,7 +58,11 @@
                 <li><a href="filter.html">Filters</a>
                 <li><a href="shadow.html">Shadow Files</a>
                 <li><a href="custom.html">Custom Reports</a>
+<<<<<<< HEAD:html/task.html
                 <li><a href="faq.html">Frequently Asked Questions</a>
+=======
+                <li><a href="import.html">Data Import</a>
+>>>>>>> import:html/task.html
               </ul>
 
               <p>
@@ -119,6 +123,12 @@
                       task are also modified.
                   <li>Custom reports now support user-specified column labels (thanks to T.
                       Charles Yun).
+                  <li>Task can now import tasks from a variety of data formats, including task
+                      export files from versions 1.4.3 and earlier, versions 1.5.0 and later,
+                      todo.sh 2.x, CSV, plain text and task command line.  See online docs for
+                      full details.
+                  <li>Export was including 'id' in the column header even though it was not
+                      included in the data.
                 </ul>
 
                 <p>