3 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author	SHA1	Message	Date
Richard Linden	a677d87d0f	fix for build errors...removed duplicate definition of getpid on windows	2014-04-07 19:32:24 -07:00
Richard Linden	98aabdc176	merge with release	2014-04-07 19:09:40 -07:00
Aura Linden	6809348125	Creating a cleaner branch	2013-12-03 17:06:06 -08:00