git remote add upstream git://git.apache.org/wicket.git
git branch -a
git branch development
git checkout development
git fetch upstream
git merge upstream/master
git checkout master
git merge --squash development
git remote add upstream git://git.apache.org/wicket.git
git branch -a
git branch development
git checkout development
git fetch upstream
git merge upstream/master
git checkout master
git merge --squash development