No they haven't. Read all the 8-Ks.
All of the recent 8-Ks updating the share count have only talked about the Nov, 2012 note. None of them have referenced the new series of notes.
Which are convertible at any time.
Besides that, at yesterday's CC, Gildea said that they had about $1.9M in outstanding notes. Subtract the $700K paid-off yesterday, that leaves about $1.2M still to be converted.
BTW, if they convert the $960K at $0.0114 (85% of yesterday's closing price,) that adds over 80M shares to the float.