Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 21 insertions, 7 deletions

diff --git a/doc/release-notes-0.7.1.xsl b/doc/release-notes-0.7.1.xsl
index 75158a02..1f2feeb0 100644
--- a/doc/release-notes-0.7.1.xsl
+++ b/doc/release-notes-0.7.1.xsl
@@ -8,42 +8,55 @@ Version 0.7.1 is the first release containing our new cross-platform Java-based
   </para>
   <itemizedlist>
     <listitem>
+<para>
       Receive and log telemetry from a connected TeleDongle
       device. All data received is saved to log files named with the
       current date and the connected rocket serial and flight
       numbers. There is no mode in which telemetry data will not be
       saved.
-    </listitem>
+    </para>
+</listitem>
     <listitem>
+<para>
       Download logged data from TeleMetrum devices, either through a
       direct USB connection or over the air through a TeleDongle
       device.
-    </listitem>
+    </para>
+</listitem>
     <listitem>
+<para>
       Configure a TeleMetrum device, setting the radio channel,
       callsign, apogee delay and main deploy height. This can be done
       through either a USB connection or over a radio link via a
       TeleDongle device.
-    </listitem>
+    </para>
+</listitem>
     <listitem>
+<para>
       Replay a flight in real-time. This takes a saved telemetry log
       or eeprom download and replays it through the user interface so
       you can relive your favorite rocket flights.
-    </listitem>
+    </para>
+</listitem>
     <listitem>
+<para>
       Reprogram Altus Metrum devices. Using an Altus Metrum device
       connected via USB, another Altus Metrum device can be
       reprogrammed using the supplied programming cable between the
       two devices.
-    </listitem>
+    </para>
+</listitem>
     <listitem>
+<para>
       Export Flight data to a comma-separated-values file. This takes
       either telemetry or on-board flight data and generates data
       suitable for use in external applications. All data is exported
       using standard units so that no device-specific knowledge is
       needed to handle the data.
-    </listitem>
+    </para>
+</listitem>
     <listitem>
+<para>
       Speak to you during the flight. Instead of spending the flight
       hunched over your laptop looking at the screen, enjoy the view
       while the computer tells you what’s going on up there. During
@@ -52,6 +65,7 @@ Version 0.7.1 is the first release containing our new cross-platform Java-based
       range information to try and help you find your rocket in the
       air. Once on the ground, the direction and distance are
       reported.
-    </listitem>
+    </para>
+</listitem>
   </itemizedlist>
 </article>