Merge branch 'master' into topic/vigs_noe2sgn-146.0
commit44eac5a82ac3a6382f63f219be0d3167cf1f1e95
authornoefp <noeisneo@gmail.com>
Wed, 12 Jun 2013 13:46:58 +0000 (12 13:46 +0000)
committernoefp <noeisneo@gmail.com>
Wed, 12 Jun 2013 13:46:58 +0000 (12 13:46 +0000)
tree75ad066649154dccb1f99b65119af0e922c59d7e
parentc17d5d36cc938cecce8f195aed8af04055e2b04c
parent2d880780c81b3146425c625640443ffa3bef1949
Merge branch 'master' into topic/vigs_noe2