Merge branch 'master' of ssh://git.phpeclipse.com/phpeclipse
authorEdward Mann <ed.mann@arctechnologies.net>
Mon, 4 Feb 2013 21:08:06 +0000 (15:08 -0600)
committerEdward Mann <ed.mann@arctechnologies.net>
Mon, 4 Feb 2013 21:08:06 +0000 (15:08 -0600)
Pulling in different changes


Trivial merge