Merge remote branch 'origin/devel' into mine
commit25dfd2601780c096320674dae4ce9b5e2f2b7bce
authorMichael Ploujnikov <ploujj@gmail.com>
Tue, 5 Jan 2010 00:53:18 +0000 (4 19:53 -0500)
committerMichael Ploujnikov <ploujj@gmail.com>
Tue, 5 Jan 2010 00:53:18 +0000 (4 19:53 -0500)
treede4df0967c9d8ddb98ab1402a07a4c352776375e
parente5d6bcebdd1f7ea1f9c70e4e1cbef19add9f6de9
parent34c886db4790b01bf258809beb86c42e85212aab
Merge remote branch 'origin/devel' into mine
src/nobug.h