Merge branch 'nloptr' into team
authorJoshua Nathaniel Pritikin <jpritikin@pobox.com>
Sun, 8 Feb 2015 14:28:43 +0000 (09:28 -0500)
committerJoshua Nathaniel Pritikin <jpritikin@pobox.com>
Sun, 8 Feb 2015 14:28:43 +0000 (09:28 -0500)
commitfd4dd97b9903394f7b234525a282ad2a69628efa
treef77dc00556f26fd4bfb3136635729cb85ede2499
parented6995a0ffd19d35b2de18a9d210536bd226211c
parent148c4f7b4a2fb0f00a1d4026f5f9bb61609ed56a
Merge branch 'nloptr' into team