[Bro-Dev] Merging updates

[Robin Sommer]

Two updates regarding merges:

    - Jon Siwek is joining the ranks of the Bro Merge Masters(TM). So
      it's now Jon, Seth, and myself doing merges of topic branches
      into master across the bro.org repositories.

    - I've updated our "Development Process" page with some notes on
      how we generally merges and generally commits to master:

        http://www.bro.org/development/howtos/process.html#committing-to-master
        http://www.bro.org/development/howtos/process.html#merging-a-topic-branch

Robin

-- 
Robin Sommer * Phone +1 (510) 722-6541 *     robin at icir.org
ICSI/LBNL    * Fax   +1 (510) 666-2956 * www.icir.org/robin