From f153b5df5abc74fd730745b81d75abcf6134631b Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Tue, 16 Dec 2014 00:55:21 +0100
Subject: [PATCH] second release candidate for next stable release v5.4

---
 CHANGELOG.md      | 21 +++++++++++++++++++++
 paparazzi_version |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94426d4b3a3..7e04e219af4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+Paparazzi 5.3.1_testing
+=======================
+
+Second release candidate for v5.4 stable release.
+
+- modules: nav_survey_poly_osam improvements
+  [#938] (https://github.com/paparazzi/paparazzi/pull/938)
+- ARDrone2: mag freeze detection
+  [#1025] (https://github.com/paparazzi/paparazzi/pull/1025)
+  [#1026] (https://github.com/paparazzi/paparazzi/pull/1026)
+  [#1030] (https://github.com/paparazzi/paparazzi/pull/1030)
+- ARDrone2: remove unneeded last_checksum_wrong
+  [#1032] (https://github.com/paparazzi/paparazzi/pull/1032)
+- rotorcraft: fix USE_KILL_SWITCH_FOR_MOTOR_ARMING
+  [#1038] (https://github.com/paparazzi/paparazzi/pull/1038)
+- server: log LINK_REPORT message
+  [#1031] (https://github.com/paparazzi/paparazzi/issues/1031)
+- stm32: partial Lisa MX luftboot support
+  [#1017] (https://github.com/paparazzi/paparazzi/pull/1017)
+
+
 Paparazzi 5.3.0_testing
 =======================
 
diff --git a/paparazzi_version b/paparazzi_version
index 3b039260e12..444828a00bb 100755
--- a/paparazzi_version
+++ b/paparazzi_version
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v5.3.0_testing
+DEF_VER=v5.3.1_testing
 
 # First try git describe (if running on a git repo),
 # then use default version from above (for release tarballs).