Update trash flag module
Merge branch '7.x-2.x' of http://git.drupal.org/project/oa_core into 7.x-2.x