annotate .svn/pristine/38/388380478a42a623e2dea4570d513e4016b08ee9.svn-base @ 1459:cf78a7ade302 luisf

Merge from branch "bug_794"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 11 Nov 2013 18:25:50 +0000
parents cbb26bc654de
children
rev   line source
Chris@909 1 washington:
Chris@909 2 id: 1
Chris@909 3 name: Washington, D.C.
Chris@909 4 latitude: 38.895
Chris@909 5 longitude: -77.036667
Chris@909 6 version: 1