Administrivia:

automate merging

Author: rocky

admin-tools/merge-for-2.4.sh

@@ -0,0 +1,5 @@
+#/bin/bash
+cd $(dirname ${BASH_SOURCE[0]})
+if . ./setup-python-2.4.sh; then
+    git merge python-3.0-to-3.2
+fi

admin-tools/merge-for-3.0.sh

@@ -0,0 +1,5 @@
+#/bin/bash
+cd $(dirname ${BASH_SOURCE[0]})
+if . ./setup-python-3.0.sh; then
+    git merge python-3.3-to-3.5
+fi

admin-tools/merge-for-3.3.sh

@@ -0,0 +1,5 @@
+#/bin/bash
+cd $(dirname ${BASH_SOURCE[0]})
+if . ./setup-python-3.3.sh; then
+    git merge master
+fi