gistfile1.txt

  504  git fetch
  505  git fetch upstream
  506  git checkout upstream-master
  507  git merge upstream-master upstream/master
  508  git checkout -b gschueler-fix-unescaped-messages upstream-master
  509  git pull http://github.com/gschueler/rundeck.git fix-unescaped-messages
  510  git checkout upstream-master
  511  git merge gschueler-fix-unescaped-messages
  512  git log
  513  git log --pretty=oneline

===== Output from git log =====

1d5c556cf4e0215c1431e5ed193f7cc66f24aff1 Merge branch 'fix-unescaped-messages' of http://github.com/gschueler/rundeck into gschueler-fix-unescaped-messages
57e28a68ce08322dbfad3da916399e23954091a2 Merge branches 'gs-issue46' and 'upstream-master' into upstream-master
996d7cb342372b9b0ddb48eba02298044e891810 Merge branch 'issue46' of http://github.com/gschueler/rundeck into gs-issue46
16b8140273dc992b2318939915be03b5dfa96459 Add basic README to test directory.
30b439d1a39a53a74dabc74e36fd09131631ee80 change the default file permissions on test/*.sh to u+x
336886cd04ba2975ea7202475ed7a377119dbc4b Merge branch 'simple-tests' of http://github.com/gschueler/rundeck into gs-simple-test
98ce7eb013953e372081fc2710cc006114ec655e Fix sed and grep for run-jobs load output success test
1f145493257a1f06fdd88da3567ff6e566c7f1f0 Add simple test script for fresh install verification
14124b1a6c0d348fecd2103e3dd09a4b1ecf8f71 fix parsing of error message response
c7ba72e2a58d8feb5aeb1ce613626cef13eb2b1d Clarify close button language and don't change it
399f12f31b4f50f239f6a19db12b3ce00c6885f4 Fix cancel/continue javascript call in remote edit frame
ed7ac6bbd6761006f1f18bc69131de856ff1bbf2 Update protocol to not be required for remoteUrl; more exact; clean ...