Index: branches/1.2.4-critical/Changelog
===================================================================
--- branches/1.2.4-critical/Changelog	(revision 10813)
+++ branches/1.2.4-critical/Changelog	(revision 10814)
@@ -1,3 +1,9 @@
+pcb-rnd 1.2.5 (r10635+bakcports)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	- Fix: import pcb into paste buffer layer binding bug
+	- Fix: gerber drill file units
+	- Fix: RTT tests shouldn't fail if ImageMagick is not installed
+
 pcb-rnd 1.2.4 (r10635)
 ~~~~~~~~~~~~~~~~~~~~~~
 	[subc]
Index: branches/1.2.4-critical/Release_notes
===================================================================
--- branches/1.2.4-critical/Release_notes	(revision 10813)
+++ branches/1.2.4-critical/Release_notes	(revision 10814)
@@ -1,18 +1,6 @@
-pcb-rnd 1.2.4
+pcb-rnd 1.2.5
 ~~~~~~~~~~~~~
 
-This release starts the next major undertaking of pcb-rnd: the data
-model cleanup. The internal data model has been upgraded into a more
-proper tree; subcircuits has been added to group arbitrary objects.
-
-This effort triggered various cleanups and fixes, including a more
-coherent model how layers are stored in buffers and subcircuits, enabling
-them to be reused among boards with different stackups.
-
-The io_ plugins evolved too: pcb-rnd can read binary board files
-produced by eagle and read/write Protel's autotrax/easytrax format.
-
-The xy_ exporter has been upgraded to use templates for its output format.
-This enables pcb-rnd to support different fabs easier. Adding support
-for a new fab is a question of adding a new template - usually no coding
-required.
+This release is an unscheduled bugfix release. It is essentially
+version 1.2.4 with a few critical bugfixes backported from trunk/.
+Please refer to the Changelog for more details.
Index: branches/1.2.4-critical
===================================================================
--- branches/1.2.4-critical	(revision 10813)
+++ branches/1.2.4-critical	(revision 10814)

Property changes on: branches/1.2.4-critical
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r10812