Merge remote-tracking branch 'origin/bugfix/documentation'
commit0e0b23720d4a95cb254f0cee0217c528c5bbae2c
authorfundamental <mark.d.mccurry@gmail.com>
Thu, 24 May 2012 02:42:38 +0000 (23 22:42 -0400)
committerfundamental <mark.d.mccurry@gmail.com>
Thu, 24 May 2012 02:42:38 +0000 (23 22:42 -0400)
treeeaaf9ec5c0fbc4f10496328cf9cd16a500b31c0b
parent3edc0e96a4a49548f181fe43c58545526a9aeb58
parent6f586c26999c9ed860bfb07bb79fff212cee4060
Merge remote-tracking branch 'origin/bugfix/documentation'

Conflicts:
doc/Makefile
doc/Makefile