[freeside-commits] branch FREESIDE_3_BRANCH updated. a0877673b88d523c3c4ede51ff2c238285d8aeea

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  a0877673b88d523c3c4ede51ff2c238285d8aeea (commit)
       via  29bd43c28ef5a1b418f0fbef9791cc4879c438fe (commit)
      from  b0c05606c571c67e750ccd3c34c35d5e77345aba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a0877673b88d523c3c4ede51ff2c238285d8aeea
Merge: 29bd43c b0c0560
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 16 16:05:30 2016 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit 29bd43c28ef5a1b418f0fbef9791cc4879c438fe
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 16 15:55:25 2016 -0700

    core team updates

diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index 9e77828..555bab4 100644
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -30,8 +30,9 @@
 <BR>
 
 <H3>Core Team</H3>
-Jeremy Davis<BR>
+Nathan Kennedy<BR>
 Ivan Kohler<BR>
+Jonathan Prykop<BR>
 Mark Wells<BR>
 <BR>
 
@@ -40,6 +41,7 @@ Mark Wells<BR>
 
 <H3>Core Emeritus</H3>
 Peter Bowen<BR>
+Jeremy Davis<BR>
 Jeff Finucane<BR>
 Jason Hall<BR>
 Kristian Hoffman<BR>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/docs/credits.html |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)