nZEDb/nZEDb — pull request #613 by jonnyboy (2013-06-03 23:26:16+00:00)
Title: Merge pull request #612 from nZEDb/master

updating dev to master