要保持代码一致啊#8

Open

picasso250 wants to merge 69 commits intoSo-Me:masterfrom

picasso250:master

Commits on Dec 5, 2012

Commits on Dec 6, 2012

Commits on Dec 7, 2012

xxx
picasso250
committed
f
picasso250
committed

Commits on Dec 8, 2012

Commits on Dec 10, 2012

update
picasso250
committed
give args
picasso250
committed
shop list ok
picasso250
committed
dos2unix
picasso250
committed
enlarge latitude and longitude
picasso250
committed
..
picasso250
committed
test ok
picasso250
committed
add 3 tables
picasso250
committed
test ok
picasso250
committed
force master
picasso250
committed
add title
picasso250
committed
url --> server response
picasso250
committed
open in blank
picasso250
committed
view frame ok
picasso250
committed
shop ok
picasso250
committed
doing shop
picasso250
committed
doing shop
picasso250
committed
shop view
picasso250
committed
category haha
picasso250
committed
big category
picasso250
committed
district ok
picasso250
committed
~
picasso250
committed