Bring back the "cancel" button to node forms.
added code for os_board

Added code for os_board
removed os_board code changes

removed os_board code changes and created a branch and put changes in there
Revert "removed os_board code changes"

This reverts commit e7fedc85934bb6102ff0ded7fd81b5919be0ea12.
Revert "added code for os_board"

This reverts commit 6c8212d7986e298a3abd482abdbfb8cb08e7f386.
Add asterik to year field in Publication form.
Add t() function.
Add description to "Posted by" field Publication form.
Make GKing custom theme settings control collapsed by default.
remove os_board from make file
Merge pull request #6014 from wuqiank/os_board

remove os_board from make file
Add description to all node forms, not just biblio.
Put "delete" link after buttons.
Merge pull request #6006 from openscholar/6002

Add description to name field in author fieldset on node form.
Merge pull request #6008 from openscholar/6000

Make GKing custom theme settings control collapsed by default.
Merge pull request #6005 from openscholar/5999

Add asterisk to year field in Publication form.
Merge pull request #6018 from openscholar/5905-1

Bring back the "cancel" button to node forms.
Fix git mering problem.