[LA-Policies] [linuxaustralia/constitution_and_policies] 10b530: Merge pull request #1 from linuxaustralia/master

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/linuxaustralia/constitution_and_policies
  Commit: 10b530d49091ba618ee8236cc9b26c7afcb12e11
      https://github.com/linuxaustralia/constitution_and_policies/commit/10b530d49091ba618ee8236cc9b26c7afcb12e11
  Author: Kathy Reid <kathy at kathyreid.id.au>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M activities-calendar.md
    M code_of_conduct.md
    M event-checklist.md
    A mail-list-policy.md
    R mail-list-policy.txt
    M subcommittee_policy_v2.md

  Log Message:
  -----------
  Merge pull request #1 from linuxaustralia/master

pulling in from master to make my copy of constitution and policies up to date


  Commit: 601bf676e17dece7b53e05244626c00e676c1044
      https://github.com/linuxaustralia/constitution_and_policies/commit/601bf676e17dece7b53e05244626c00e676c1044
  Author: Kathy Reid <kathy at kathyreid.id.au>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M activities-calendar.md

  Log Message:
  -----------
  changes after chatting with @jhesketh


  Commit: 21810f4766ad313197d1ed1eefbcaacf68aec73f
      https://github.com/linuxaustralia/constitution_and_policies/commit/21810f4766ad313197d1ed1eefbcaacf68aec73f
  Author: Joshua Hesketh <josh at nitrotech.org>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    M activities-calendar.md

  Log Message:
  -----------
  Merge pull request #21 from KathyReid/activity-calendar

Activity calendar modifications


Compare: https://github.com/linuxaustralia/constitution_and_policies/compare/dce32d292562...21810f4766ad