17 files changed, 96 insertions, 15 deletions
diff --git a/README b/README
index 68ea132..082fd25 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 This is Rakudo Star, a useful, usable Perl 6 distribution for "early adopters".
 
-This is the 2014.01 release of Rakudo Star.
+This is the 2014.03 release of Rakudo Star.
 
 Rakudo Star is Copyright (C) 2010 - 2014 by the Rakudo Star Team.
 
@@ -14,7 +14,7 @@ copyright and licensing information of those components.
 Build Prerequisites
 -------------------
 To build Rakudo Star you need at least a C compiler, a 'make' utility,
-and Perl 5.9.0 or newer.  You probably also want a machine with a fair
+and Perl 6.1.0 or newer.  You probably also want a machine with a fair
 amount of memory available: 1GB is known to be too small for building 
 Rakudo, while 2GB is generally known to be sufficient.
 
diff --git a/docs/announce/2014.03.md b/docs/announce/2014.03.md
new file mode 100644
index 0000000..e481f9e
--- /dev/null
+++ b/docs/announce/2014.03.md
@@ -0,0 +1,73 @@
+# Announce: Rakudo Star Release 2014.03
+
+## A useful, usable, "early adopter" distribution of Perl 6
+
+On behalf of the Rakudo and Perl 6 development teams, I'm happy to
+announce the March 2014 release of "Rakudo Star", a useful and usable
+distribution of Perl 6. The tarball for the March 2014 release is
+available from <http://rakudo.org/downloads/star/>. A Windows .MSI
+version of Rakudo star will usually appear in the downloads area
+shortly after the tarball release.
+
+In the Perl 6 world, we make a distinction between the language
+("Perl 6") and specific implementations of the language such as
+"Rakudo Perl". This Star release includes [release 2014.03] of the
+[Rakudo Perl 6 compiler], version 6.1.0 of the [Parrot Virtual
+Machine], plus various modules, documentation, and other resources
+collected from the Perl 6 community.
+
+[release 2014.03]:
+    https://github.com/rakudo/rakudo/blob/nom/docs/announce/2014.03.md
+[Rakudo Perl 6 compiler]: http://github.com/rakudo/rakudo
+[Parrot Virtual Machine]: http://parrot.org
+
+Some of the new features added to this release include:
+
++ The core of Rakudo::Debugger is now part of Rakudo
+  itself and works across all backends.
++ "make" no longer itemizes its arguments.
++ for-loops at the statementlist level are now sunk by default.
++ better parsing of unspaces and formatting codes inside Pod blocks.
++ Fix for for-loops to be properly lazy
++ Numerous Pod parsing and formatting improvements
++ @<c> as shortcut for @$<c>, %<c> as shortcut for %$<c>
++ list infix reductions no longer flatten
++ Numerous compiler suggestion improvements
+
+Please note that this release of Rakudo Star does not support the JVM
+nor the MoarVM backends from the Rakudo compiler. While the other backends
+mostly implement the same features as the Parrot backend, some bits are
+still missing that lead to module build problems or test failures.
+We hope to provide experimental JVM-based and MoarVM-based Rakudo Star
+releases in April 2014.
+
+There are some key features of Perl 6 that Rakudo Star does not yet
+handle appropriately, although they will appear in upcoming releases.
+Some of the not-quite-there features include:
+
+  * advanced macros
+  * threads and concurrency (in work for the JVM and MoarVM backend)
+  * Unicode strings at levels other than codepoints
+  * interactive readline that understands Unicode
+  * non-blocking I/O
+  * much of Synopsis 9 and 11
+
+There is an online resource at <http://perl6.org/compilers/features>
+that lists the known implemented and missing features of Rakudo and
+other Perl 6 implementations.
+
+In many places we've tried to make Rakudo smart enough to inform the
+programmer that a given feature isn't implemented, but there are many
+that we've missed. Bug reports about missing and broken features are
+welcomed at <rakudobug@perl.org>.
+
+See <http://perl6.org/> for links to much more information about
+Perl 6, including documentation, example code, tutorials, reference
+materials, specification documents, and other supporting resources. A
+draft of a Perl 6 book is available as docs/UsingPerl6-draft.pdf in
+the release tarball.
+
+The development team thanks all of the contributors and sponsors for
+making Rakudo Star possible. If you would like to contribute, see
+<http://rakudo.org/how-to-help>, ask on the <perl6-compiler@perl.org>
+mailing list, or join us on IRC \#perl6 on freenode.
diff --git a/modules/Bailador b/modules/Bailador
-Subproject ea8af23beacec16b77367b920b24df51bdbf092
+Subproject 36cefd253f80b836f98d79c0cef58c32a1f6c5b
diff --git a/modules/DBIish b/modules/DBIish
-Subproject bf5de44646d5c00ce77df5b919cbf174a9fb624
+Subproject c9c012d0d9a829614dbad903fec46103a146da5
diff --git a/modules/Pod-To-HTML b/modules/Pod-To-HTML
-Subproject 33d38234c5702cb54abdb4c5dff457bbf4096dd
+Subproject c95ef03c7bb7e5fcd86d35800b9c87d756d418a
diff --git a/modules/Template-Mojo b/modules/Template-Mojo
-Subproject 43b7f46591a50a3824f46c9d8e535a6a6ce7fee
+Subproject b1b6fa6c626575385b334bb423d66111598fb0b
diff --git a/modules/doc b/modules/doc
-Subproject 80fc869305663b5100d89b2131b860361445cc5
+Subproject f262137194d70d100aa0b43706318b096a50abd
diff --git a/modules/file-find b/modules/file-find
-Subproject f158820a4426554ebe964b9a21469f3dafcfa8c
+Subproject d79a83184da825f61d8c481050f931b511d74ca
diff --git a/modules/jsonrpc b/modules/jsonrpc
-Subproject 15c8904baa92b4730a5d973a2a4650b2b684b52
+Subproject 8349d6d0c0c7edcf4d965eac7e9e8ca2dfc4493
diff --git a/modules/panda b/modules/panda
-Subproject 934a4f31525e1a743afbf9080cd68a34d968d2c
+Subproject d37c0173923d0bee7f43b4daa544f838abab33b
diff --git a/modules/perl6-lwp-simple b/modules/perl6-lwp-simple
-Subproject 97fd14b862a420a53d1e906ac4e20035318cb74
+Subproject 49cc497bb72849767a730c923bacfabc64c3eaa
diff --git a/modules/rakudo-debugger b/modules/rakudo-debugger
-Subproject 7fe09673f3fd8930db150a1ea499bd44f1a7821
+Subproject 30c847500f10631dc447ae557a59a5211178d4b
diff --git a/modules/uri b/modules/uri
-Subproject 81f5eece2fe18809165db33a0e71871297980b7
+Subproject 15afe452abdf609e382f81377f0f96f4a3e05ab
diff --git a/modules/zavolaj b/modules/zavolaj
-Subproject 6c38010e42f6197746097a2c38fb5be449dba43
+Subproject b211b809407bf5dadf8ba24895ed9c925a455fa
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 961877e..e4352a6 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -43,8 +43,11 @@ PERL6_M_INSTALL  = $(MOAR_BIN_DIR)/$(PERL6_M_EXE)
 
 PERL6_EXE        = perl6$(EXE)
 
+<<<<<<< HEAD
+=======
 MODULES = modules/MODULES.txt
 
+>>>>>>> origin/tristar
 all: rakudo
 
 rakudo: @backend_exes@
@@ -73,6 +76,8 @@ modules-install-p:
 	@echo "== Installing binaries for Parrot"
 	$(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) p modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
 
+<<<<<<< HEAD
+=======
 modules-install-j:
 	@echo "== Installing modules for JVM"
 	$(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_J_INSTALL) $(DESTDIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES)
@@ -96,6 +101,7 @@ modules-test-j:
 modules-test-m:
 	$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) modules/MODULES.txt
 
+>>>>>>> origin/tristar
 install: rakudo-install modules-install
 
 test:
diff --git a/tools/star/Makefile b/tools/star/Makefile
index 76c5dd7..772bfeb 100644
--- a/tools/star/Makefile
+++ b/tools/star/Makefile
@@ -1,7 +1,7 @@
-RAKUDO_VER  = 2014.01
-NQP_VER     = 2014.01
-PARROT_VER  = 5.9.0
-MOAR_VER    = 2014.01
+RAKUDO_VER  = 2014.03.01
+NQP_VER     = 2014.03
+PARROT_VER  = 6.1.0
+MOAR_VER    = 2014.03
 
 STAR_REL    = rakudo-star-$(VERSION)
 STAR_TGZ    = $(STAR_REL).tar.gz
diff --git a/tools/star/release-guide.pod b/tools/star/release-guide.pod
index 58f62ec..2e77810 100644
--- a/tools/star/release-guide.pod
+++ b/tools/star/release-guide.pod
@@ -94,13 +94,15 @@ for the Star release.  To bring all modules up to the current
   # pull master in each submodule dir
   $ git submodule foreach git pull origin master
 
-B<ATTENTION!> Currently, the Perl6::MIME::Base64 repo  needs to be kept at a
-specific commit, due to breakage on Rakudo's part. The above command will have
-incorrectly merged commits. To fix this, run these commands from the top of the
-star repo:
-
-  $ cd modules/Perl6-MIME-Base64
-  $ git checkout 76fd9decc7c1445390b0ab5a1296e9d244f8e1fd
+B<ATTENTION!> Currently, the perl6-lwp-simple repo needs to be kept at a
+specific fork/branch, due to changes of a wiki page that get fetched in tests.
+See: https://github.com/cosimo/perl6-lwp-simple/pull/28
+To fix this, run these commands from the top of the star repo:
+
+  $ cd modules/perl6-lwp-simple
+  $ git remote add froggs git@github.com:FROGGS/perl6-lwp-simple.git
+  $ git checkout -b patch-5
+  $ git pull froggs patch-5
   $ cd -
 
 Then you may commit your update of the submodules:
@@ -229,8 +231,7 @@ You're done!  Celebrate with the appropriate amount of fun.
     Release         Release manager
     =======         ===============
 
-    2014.03         (jnthn)
-    2014.04         (unknown yet)
+    2014.04         jnthn
 
 =head2 List of Previous Star Releases
 
@@ -269,6 +270,7 @@ You're done!  Celebrate with the appropriate amount of fun.
     2013.11         moritz
     2013.12         lue
     2014.01         tadzik
+    2014.03         FROGGS
 
 =cut