Merge branch 'packer/alias_movetospec' into 'master'

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index aaade5f752afc2314c43225e618bd799b63a3022..41092cd207969cced37b65c1e2d544ba5069c3e5 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 13 19:44:31 CET 2015
+Mon Dec 28 22:25:00 CET 2015