gplugin/gplugin

flow: Promoted <develop> 'trunk' (7c08161e01dc) to 'feature/osx-fixing'.
feature/osx-fixing
2015-03-05, Gary Kramlich
1dde3157546b
flow: Promoted 'trunk' (7c08161e01dc) to 'feature/osx-fixing'.
BOOLEAN:OBJECT,POINTER
VOID:ENUM,ENUM
VOID:INT,INT
VOID:OBJECT