b1076e6d868dd973fd561131c962cd82dc6368e5 0f82791a538ad97c112fe4a154d22e3e0754109c K. Adam Christensen pope@shifteleven.com http://github.com/pope/personal/commit/93c24e73251a80e3e424598ca1351f8d6a18f1b3 93c24e73251a80e3e424598ca1351f8d6a18f1b3 2009-05-22T14:55:08-07:00 2009-05-22T14:55:08-07:00 Merge commit 'origin' Conflicts: etc/vim/plugin/vjde_maven.vim c3f359b0df3cc5f9b147b02b5fc7b7b55317b703 K. Adam Christensen pope@shifteleven.com