Merge branch 'master' into servlets
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 29 Nov 2013 12:20:17 +0000 (12:20 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 29 Nov 2013 12:20:17 +0000 (12:20 +0000)
commita2d6e1ecf6f7f5bead60c5e33874eeedfe58dc50
treebb5ba7b2cf5823323633834cfbcc5c9495e2823e
parentb154a542bd08371e3bcc7d92d0ded1c638399087
parent9b9ca0133f42fd2a9fa62eb6d075c5ef6ef916ca
Merge branch 'master' into servlets

Conflicts:
WEB-INF/web.xml
website/AllReports.jsp
website/Index.jsp
website/ReportSequenceProtein.jsp