gnucash-htdocs branch beta updated. svn_last-510-g14050ba

[Geert Janssens]

The beta branch has been updated
       via  https://github.com/Gnucash/gnucash-htdocs/commit/14050ba9 (commit)
      from  https://github.com/Gnucash/gnucash-htdocs/commit/ee18e616 (commit)


- Log -----------------------------------------------------------------
commit 14050ba902dcac56f90c0c307f93213c6484459c
Merge: 953b989 ee18e61
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed May 29 16:42:29 2013 +0200

    Reset beta to master (while keeping history)
    
    This is done by this series of commands
    1. git checkout master
    2. git checkout -b tmp # Creates a temporary branch at the head of master
    3. git merge -s ours beta # Discards all changes from beta
    4. git checkout beta
    5. git reset --hard tmp # Sets beta HEAD to the merged HEAD
    6. git branch -d tmp
    (Optional)
    7. git commit --amend # To improve the commit message

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

Summary of changes:
 README |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
gnucash-htdocs