updated to drupal core 7.26
Merge commit '49d7cab0662f6331a4d626ec28530d81a4ac1237' into 7.x-stable