Merge branch 'topic/bug3302'
commit1d5e607b4e98b01067c1a7eeef8471086df8a26b
authorPaul Cantalupo <pcantalupo@gmail.com>
Tue, 5 Mar 2013 17:24:56 +0000 (5 12:24 -0500)
committerPaul Cantalupo <pcantalupo@gmail.com>
Tue, 5 Mar 2013 17:24:56 +0000 (5 12:24 -0500)
tree1498986f6968fc7f03115d40db1e0297bec47993
parent3356ac9a00d411ffaf59beb516e1989081005b76
parentf0f49bac685562ebdafee94f355ebd29662eb4ef
Merge branch 'topic/bug3302'

* topic/bug3302:
  fixing bug 3302 and adding test