Merge branch 'saltation' into new-saltation saltation_deploy_v2
authorroot <root@code.saltation.de>
Mon, 11 Jul 2011 11:30:09 +0000 (13:30 +0200)
committerroot <root@code.saltation.de>
Mon, 11 Jul 2011 11:30:09 +0000 (13:30 +0200)
commit44b87a944a1d45931b11f7a1ff7c33ab2355081c
tree8e1e5edca160d9d4c8289cbdb8a4eb25c7a281ef
parent571ea83bfb6a10e20df5503be42172f9d0ebcc4f
parentc540963f987a20e05c77d425c8dea015cba27272
Merge branch 'saltation' into new-saltation

Conflicts:
public/javascripts/gitorious/diff_browser.js
public/javascripts/gitorious/diff_browser.js