SA-CORE-2014-005 by Stefan Horst, greggles, larowlan, David_Rothstein, klausi: Fixed SQL injection vulnerability.
Tests for SA-CORE-2014-005 by Stefan Horst, greggles, larowlan, David_Rothstein, klausi.
Issue #171: Convert node types to use config files.
Issue #311: Changed admin menu search form element #type to 'search'.
Merge pull request #512 from dgoutam/1.x

Issue: #320 Rounded corners and gradients are sooooooo 2011.
Merge pull request #510 from rocketnova/310/change-admin-search-type

Issue #311: Changed admin menu search form element #type to 'search'.
Issue #394: Warning: Parameter 1 to layout_page_title() expected to be a reference, value given.
Merge pull request #513 from quicksketch/394/layout_notice

Issue #394: Warning: Parameter 1 to layout_page_title() expected to be a reference, value given.
Merge pull request #506 from jenlampton/359-security

Issue #369: SA-CORE-2014-005 - Drupal core - SQL injection.
Merge pull request #507 from quicksketch/171/node_config

Issue #171: Convert node types to use config files.
Issue #401: Add a generic sorting function.
Merge pull request #514 from quicksketch/401/generic_sort

Issue #401: Add a generic sorting function.
Merge remote-tracking branch 'upstream/1.x' into 1.x