Merge branch 'drugbank'
rename to match pattern
interim commit
minor
Merge remote-tracking branch 'bio2rdf-master/master' into clinicaltrials
fixes
fix for early abortive behaviour
refactored
Merge branch 'release3' of github.com:micheldumontier/bio2rdf-scripts into clinicaltrials
Merge pull request #236 from alisoncallahan/master

Updated SGD parser to use Release 3 guidelines; some updates to statistics printer
Merge remote-tracking branch 'bio2rdf-master/master' into release3

Conflicts:
	affymetrix/affymetrix.php
Merge remote-tracking branch 'bio2rdf-master/release3' into release3

Conflicts:
	affymetrix/affymetrix.php
Merge branch 'release3' of github.com:micheldumontier/bio2rdf-scripts into release3

Conflicts:
	clinical-trials/clinicaltrials.php
added back affymetrix
Merge pull request #242 from micheldumontier/release3

clinicaltrials to bio2rdfapi and release guidelines