OSDN Git Service

Merge branch 'dogfood'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 3 Jan 2014 20:58:48 +0000 (22:58 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 3 Jan 2014 20:58:48 +0000 (22:58 +0200)
commit779355ae8ed1dd1c429405c7da5525e10de1f9cd
tree014ccb2ef1f8d34c1b183160378dd329e885ad02
parent97c9bc056f0e2ec22b4e8ca7abe6badeaf962521
parent689f6f7051724ba2a189dc4b062b9e891dafb2d3
Merge branch 'dogfood'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
doc/update/6.0-to-6.4.md
app/views/help/index.html.haml
doc/update/6.0-to-6.4.md