Whamcloud - gitweb
complete the merge