Lacey Sanderson 2a4fae4a5f Merge branch '7.x-2.x' of git.drupal.org:sandbox/spficklin/1337878 into 7.x-2.x %!s(int64=10) %!d(string=hai) anos
..
api c6fe145450 API: changed names again... hopefully the last time :) %!s(int64=11) %!d(string=hai) anos
includes c39b529262 API Update: updated all modules to use the db API %!s(int64=10) %!d(string=hai) anos
theme a6654f509e Fixed bug in stock template %!s(int64=10) %!d(string=hai) anos
tripal_stock.info d315cb9035 Changed version number to match Drupal release tag conventions %!s(int64=11) %!d(string=hai) anos
tripal_stock.install ed694de0f4 Removing TRIPAL VIEWS Deprecated functions %!s(int64=10) %!d(string=hai) anos
tripal_stock.module 188b05f512 Fix for issue #2214765. Removed blocks from Tripal %!s(int64=10) %!d(string=hai) anos
tripal_stock.views_default.inc ed694de0f4 Removing TRIPAL VIEWS Deprecated functions %!s(int64=10) %!d(string=hai) anos