[Rt-commit] rt branch, master, updated. rt-4.1.13-2-gd8e63f9

[Alex Vandiver]

The branch, master has been updated
       via  d8e63f9ae0a3bb52d04c01f652ae384b0d28086b (commit)
       via  cf8ee85f5873cd84c83973f4ac95130fd67e4747 (commit)
      from  ce5f72fbdc8bf043d45a1c09fa1c2af807a08695 (commit)

Summary of changes:
 share/html/Search/Bulk.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit d8e63f9ae0a3bb52d04c01f652ae384b0d28086b
Merge: ce5f72f cf8ee85
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jun 13 20:05:53 2013 -0400

    Merge branch '4.2/top-checkbox-on-bulk-update'
    
    Conflicts:
    	share/html/Search/Bulk.html

diff --cc share/html/Search/Bulk.html
index 4c7894b,30335e1..0b65d5c
--- a/share/html/Search/Bulk.html
+++ b/share/html/Search/Bulk.html
@@@ -371,4 -376,7 +374,5 @@@ $RowsPerPage => unde
  $Order => 'ASC'
  $OrderBy => 'id'
  $Query => undef
 -$SavedSearchId => undef
 -$SavedChartSearchId => undef
+ @UpdateTicket => ()
  </%args>

-----------------------------------------------------------------------